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

Update Boost headers (1.58.0)

 #ifndef BOOST_SERIALIZATION_LIST_HPP
 #define BOOST_SERIALIZATION_LIST_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
 // list.hpp: serialization for stl list templates

 #include <list>
 
 #include <boost/config.hpp>
 
 #include <boost/serialization/collections_save_imp.hpp>
-#include <boost/serialization/collections_load_imp.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/split_free.hpp>
+#include <boost/serialization/detail/stack_constructor.hpp>
+#include <boost/serialization/detail/is_default_constructible.hpp>
 
 namespace boost { 
 namespace serialization {
 
 template<class Archive, class U, class Allocator>

 inline void load(
     Archive & ar,
     std::list<U, Allocator> &t,
     const unsigned int /* file_version */
 ){
-    boost::serialization::stl::load_collection<
-        Archive,
-        std::list<U, Allocator>,
-        boost::serialization::stl::archive_input_seq<
-            Archive, 
-            std::list<U, Allocator> 
-        >,
-        boost::serialization::stl::no_reserve_imp<std::list<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::list<U, Allocator>::iterator hint;
+        hint = t.begin();
+        while(count-- > 0){
+            ar >> boost::serialization::make_nvp("item", *hint++);
+        }
+    }
+    else{
+        t.clear();
+        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());
+         }
+    }
 }
 
 // split non-intrusive serialization function member into separate
 // non intrusive save/load member functions
 template<class Archive, class U, class Allocator>