diff DEPENDENCIES/generic/include/boost/archive/detail/check.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/archive/detail/check.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/archive/detail/check.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_CHECK_HPP
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
 # pragma once
 #pragma inline_depth(511)
 #pragma inline_recursion(on)
@@ -50,7 +50,7 @@
 template<class T>
 inline void check_object_level(){
     typedef 
-        BOOST_DEDUCED_TYPENAME mpl::greater_equal<
+        typename mpl::greater_equal<
             serialization::implementation_level< T >,
             mpl::int_<serialization::primitive_type>
         >::type typex;
@@ -63,12 +63,12 @@
 template<class T>
 inline void check_object_versioning(){
     typedef 
-        BOOST_DEDUCED_TYPENAME mpl::or_<
-            BOOST_DEDUCED_TYPENAME mpl::greater<
+        typename mpl::or_<
+            typename mpl::greater<
                 serialization::implementation_level< T >,
                 mpl::int_<serialization::object_serializable>
             >,
-            BOOST_DEDUCED_TYPENAME mpl::equal_to<
+            typename mpl::equal_to<
                 serialization::version< T >,
                 mpl::int_<0>
             >
@@ -83,7 +83,7 @@
     // presume it has already been determined that
     // T is not a const
     BOOST_STATIC_ASSERT(! boost::is_const< T >::value);
-    typedef BOOST_DEDUCED_TYPENAME mpl::equal_to<
+    typedef typename mpl::equal_to<
         serialization::tracking_level< T >,
         mpl::int_<serialization::track_never>
     >::type typex;
@@ -105,13 +105,13 @@
     // we should only invoke this once we KNOW that T
     // has been used as a pointer!!
     typedef 
-        BOOST_DEDUCED_TYPENAME mpl::or_<
-            BOOST_DEDUCED_TYPENAME mpl::greater<
+        typename mpl::or_<
+            typename mpl::greater<
                 serialization::implementation_level< T >,
                 mpl::int_<serialization::object_serializable>
             >,
-            BOOST_DEDUCED_TYPENAME mpl::not_<
-                BOOST_DEDUCED_TYPENAME mpl::equal_to<
+            typename mpl::not_<
+                typename mpl::equal_to<
                     serialization::tracking_level< T >,
                     mpl::int_<serialization::track_selectively>
                 >
@@ -139,7 +139,7 @@
 
 template<class T>
 void inline check_pointer_tracking(){
-    typedef BOOST_DEDUCED_TYPENAME mpl::greater<
+    typedef typename mpl::greater<
         serialization::tracking_level< T >,
         mpl::int_<serialization::track_never>
     >::type typex;
@@ -151,10 +151,10 @@
 template<class T>
 inline void check_const_loading(){
     typedef
-        BOOST_DEDUCED_TYPENAME mpl::or_<
-            BOOST_DEDUCED_TYPENAME boost::serialization::is_wrapper< T >,
-            BOOST_DEDUCED_TYPENAME mpl::not_<
-                BOOST_DEDUCED_TYPENAME boost::is_const< T >
+        typename mpl::or_<
+            typename boost::serialization::is_wrapper< T >,
+            typename mpl::not_<
+                typename boost::is_const< T >
             >
         >::type typex;
     // cannot load data into a "const" object unless it's a