comparison DEPENDENCIES/generic/include/boost/serialization/base_object.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

 #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:

     // 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;

             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();

     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