diff DEPENDENCIES/generic/include/boost/serialization/vector.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/serialization/vector.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/serialization/vector.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_VECTOR_HPP
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
 # pragma once
 #endif
 
@@ -21,13 +21,19 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <boost/type_traits/is_arithmetic.hpp> 
+
+#include <boost/archive/detail/basic_iarchive.hpp>
+#include <boost/serialization/access.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/collection_size_type.hpp>
+#include <boost/serialization/item_version_type.hpp>
 
 #include <boost/serialization/collections_save_imp.hpp>
-#include <boost/serialization/collections_load_imp.hpp>
 #include <boost/serialization/split_free.hpp>
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/detail/get_data.hpp>
+#include <boost/serialization/detail/stack_constructor.hpp>
+#include <boost/serialization/detail/is_default_constructible.hpp>
 #include <boost/mpl/bool.hpp>
 
 // default is being compatible with version 1.34.1 files, not 1.35 files
@@ -70,14 +76,33 @@
     const unsigned int /* file_version */,
     mpl::false_
 ){
-    boost::serialization::stl::load_collection<
-        Archive,
-        std::vector<U, Allocator>,
-        boost::serialization::stl::archive_input_seq<
-            Archive, STD::vector<U, Allocator> 
-        >,
-        boost::serialization::stl::reserve_imp<STD::vector<U, Allocator> >
-    >(ar, t);
+    const boost::archive::library_version_type library_version(
+        ar.get_library_version()
+    );
+    // retrieve number of elements
+    item_version_type item_version(0);
+    collection_size_type count;
+    ar >> BOOST_SERIALIZATION_NVP(count);
+    if(boost::archive::library_version_type(3) < library_version){
+        ar >> BOOST_SERIALIZATION_NVP(item_version);
+    }
+    if(detail::is_default_constructible<U>()){
+        t.resize(count);
+        typename std::vector<U, Allocator>::iterator hint;
+        hint = t.begin();
+        while(count-- > 0){
+            ar >> boost::serialization::make_nvp("item", *hint++);
+        }
+    }
+    else{
+        t.reserve(count);
+        while(count-- > 0){
+            detail::stack_construct<Archive, U> u(ar, item_version);
+            ar >> boost::serialization::make_nvp("item", u.reference());
+            t.push_back(u.reference());
+            ar.reset_object_address(& t.back() , & u.reference());
+         }
+    }
 }
 
 // the optimized versions
@@ -121,9 +146,9 @@
     const std::vector<U, Allocator> &t,
     const unsigned int file_version
 ){
-    typedef BOOST_DEDUCED_TYPENAME 
+    typedef typename 
     boost::serialization::use_array_optimization<Archive>::template apply<
-        BOOST_DEDUCED_TYPENAME remove_const<U>::type 
+        typename remove_const<U>::type 
     >::type use_optimized;
     save(ar,t,file_version, use_optimized());
 }
@@ -141,9 +166,9 @@
       return;
     }
 #endif
-    typedef BOOST_DEDUCED_TYPENAME 
+    typedef typename 
     boost::serialization::use_array_optimization<Archive>::template apply<
-        BOOST_DEDUCED_TYPENAME remove_const<U>::type 
+        typename remove_const<U>::type 
     >::type use_optimized;
     load(ar,t,file_version, use_optimized());
 }
@@ -159,8 +184,6 @@
     boost::serialization::split_free(ar, t, file_version);
 }
 
-#if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // vector<bool>
 template<class Archive, class Allocator>
@@ -188,11 +211,12 @@
     // retrieve number of elements
     collection_size_type count;
     ar >> BOOST_SERIALIZATION_NVP(count);
-    t.clear();
-    while(count-- > 0){
-        bool i;
-        ar >> boost::serialization::make_nvp("item", i);
-        t.push_back(i);
+    t.resize(count);
+    int i;
+    for(i = 0; i < count; ++i){
+        bool b;
+        ar >> boost::serialization::make_nvp("item", b);
+        t[i] = b;
     }
 }
 
@@ -207,8 +231,6 @@
     boost::serialization::split_free(ar, t, file_version);
 }
 
-#endif // BOOST_WORKAROUND
-
 } // serialization
 } // namespace boost