Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/serialization/base_object.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/base_object.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/base_object.hpp b/3rdParty/Boost/src/boost/serialization/base_object.hpp index b840d25..562dbd5 100644 --- a/3rdParty/Boost/src/boost/serialization/base_object.hpp +++ b/3rdParty/Boost/src/boost/serialization/base_object.hpp @@ -1,11 +1,11 @@ #ifndef BOOST_SERIALIZATION_BASE_OBJECT_HPP #define BOOST_SERIALIZATION_BASE_OBJECT_HPP // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // base_object.hpp: @@ -45,13 +45,13 @@ namespace detail { // get the base type for a given derived type // preserving the const-ness template<class B, class D> struct base_cast { - typedef BOOST_DEDUCED_TYPENAME + typedef typename mpl::if_< is_const<D>, const B, B >::type type; BOOST_STATIC_ASSERT(is_const<type>::value == is_const<D>::value); @@ -71,13 +71,13 @@ namespace detail struct non_polymorphic { static void const * invoke(){ return 0; } }; static void const * invoke(){ - typedef BOOST_DEDUCED_TYPENAME mpl::eval_if< + typedef typename mpl::eval_if< is_polymorphic<Base>, mpl::identity<polymorphic>, mpl::identity<non_polymorphic> >::type type; return type::invoke(); } @@ -92,18 +92,18 @@ base_object(const Derived & d) BOOST_STATIC_ASSERT(! is_pointer<Derived>::value); detail::base_register<Base, Derived>::invoke(); return access::cast_reference<const Base, Derived>(d); } #else template<class Base, class Derived> -BOOST_DEDUCED_TYPENAME detail::base_cast<Base, Derived>::type & +typename detail::base_cast<Base, Derived>::type & base_object(Derived &d) { BOOST_STATIC_ASSERT(( is_base_and_derived<Base,Derived>::value)); BOOST_STATIC_ASSERT(! is_pointer<Derived>::value); - typedef BOOST_DEDUCED_TYPENAME detail::base_cast<Base, Derived>::type type; + typedef typename detail::base_cast<Base, Derived>::type type; detail::base_register<type, Derived>::invoke(); return access::cast_reference<type, Derived>(d); } #endif } // namespace serialization |