Ticket #2371: boost_archive.patch

basic_binary_iprimitive.hpp

@@ -122 +122 @@
     // we provide an optimized load for all fundamental types
     // typedef serialization::is_bitwise_serializable<mpl::_1> 
     // use_array_optimization;
+#if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
     struct use_array_optimization {
-        template <class T>
-        struct apply : public serialization::is_bitwise_serializable<T> {};
+      template <class T>
+      struct apply
+      {
+        typedef typename boost::serialization::is_bitwise_serializable<T>::type type;
+      };
     };
+#else
+    struct use_array_optimization {
+      template <class T>
+      struct apply : public boost::serialization::is_bitwise_serializable<T> {};
+    };
+#endif
 
     // the optimized load_array dispatches to load_binary 
     template <class ValueType>

basic_binary_oprimitive.hpp

@@ -118 +118 @@
     // typedef serialization::is_bitwise_serializable<mpl::_1> 
     //  use_array_optimization;
     // workaround without using mpl lambdas
+#if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
     struct use_array_optimization {
       template <class T>
+      struct apply
+      {
+        typedef typename boost::serialization::is_bitwise_serializable<T>::type type;
+      };
+    };
+#else
+    struct use_array_optimization {
+      template <class T>
       struct apply : public boost::serialization::is_bitwise_serializable<T> {};
     };
-    
+#endif
 
     // the optimized save_array dispatches to save_binary 
     template <class ValueType>

detail/abi_suffix.hpp

@@ -8 +8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#if defined( __BORLANDC__ )
-#pragma nopushoptwarn
-#endif
-
 #ifdef BOOST_MSVC
 #pragma warning(pop)
 #endif
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+