Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-08-02 20:41:55 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-08-02 21:03:09 (GMT) |
| commit | d5ace22054203c7989691ae8b3fa4e4784d1b57e (patch) | |
| tree | 64d400cdb10644967df183d0f202fcbf8160a773 /3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp | |
| parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
| download | swift-contrib-ks/boost1.47.zip swift-contrib-ks/boost1.47.tar.bz2 | |
Add two extra Boost dependencies, upgrade to 1.47.0ks/boost1.47
Diffstat (limited to '3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp b/3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp index 8dcd988..ffb021e 100644 --- a/3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp +++ b/3rdParty/Boost/src/boost/type_traits/is_virtual_base_of.hpp @@ -52,14 +52,14 @@ struct is_virtual_base_of_impl<Base, Derived, mpl::true_> ~boost_type_traits_internal_struct_Y()throw(); }; #else - struct boost_type_traits_internal_struct_X : Derived, virtual Base + struct boost_type_traits_internal_struct_X : public Derived, virtual Base { boost_type_traits_internal_struct_X(); boost_type_traits_internal_struct_X(const boost_type_traits_internal_struct_X&); boost_type_traits_internal_struct_X& operator=(const boost_type_traits_internal_struct_X&); ~boost_type_traits_internal_struct_X()throw(); }; - struct boost_type_traits_internal_struct_Y : Derived + struct boost_type_traits_internal_struct_Y : public Derived { boost_type_traits_internal_struct_Y(); boost_type_traits_internal_struct_Y(const boost_type_traits_internal_struct_Y&); |