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

Update Boost headers (1.58.0)

 #ifndef BOOST_SERIALIZATION_VARIANT_HPP
 #define BOOST_SERIALIZATION_VARIANT_HPP
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
 # pragma once
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1020)
-#  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // variant.hpp - non-intrusive serialization of variant types
 //

     boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const & v,
     unsigned int /*version*/
 ){
     int which = v.which();
     ar << BOOST_SERIALIZATION_NVP(which);
-    typedef BOOST_DEDUCED_TYPENAME  boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types types;
+    typedef typename  boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types types;
     variant_save_visitor<Archive> visitor(ar);
     v.apply_visitor(visitor);
 }
 
 template<class S>

             if(which == 0){
                 // note: A non-intrusive implementation (such as this one)
                 // necessary has to copy the value.  This wouldn't be necessary
                 // with an implementation that de-serialized to the address of the
                 // aligned storage included in the variant.
-                typedef BOOST_DEDUCED_TYPENAME mpl::front<S>::type head_type;
+                typedef typename mpl::front<S>::type head_type;
                 head_type value;
                 ar >> BOOST_SERIALIZATION_NVP(value);
                 v = value;
                 ar.reset_object_address(& boost::get<head_type>(v), & value);
                 return;
             }
-            typedef BOOST_DEDUCED_TYPENAME mpl::pop_front<S>::type type;
+            typedef typename mpl::pop_front<S>::type type;
             variant_impl<type>::load(ar, which - 1, v, version);
         }
     };
 
     template<class Archive, class V>

         Archive & ar,
         int which,
         V & v,
         const unsigned int version
     ){
-        typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<mpl::empty<S>,
+        typedef typename mpl::eval_if<mpl::empty<S>,
             mpl::identity<load_null>,
             mpl::identity<load_impl>
         >::type typex;
         typex::invoke(ar, which, v, version);
     }

     Archive & ar, 
     boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>& v,
     const unsigned int version
 ){
     int which;
-    typedef BOOST_DEDUCED_TYPENAME boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types types;
+    typedef typename boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types types;
     ar >> BOOST_SERIALIZATION_NVP(which);
     if(which >=  mpl::size<types>::value)
         // this might happen if a type was removed from the list of variant types
         boost::serialization::throw_exception(
             boost::archive::archive_exception(