diff options
Diffstat (limited to 'boost/serialization/deque.hpp')
| -rw-r--r-- | boost/serialization/deque.hpp | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/boost/serialization/deque.hpp b/boost/serialization/deque.hpp index 7012902918..e182f7b67f 100644 --- a/boost/serialization/deque.hpp +++ b/boost/serialization/deque.hpp @@ -21,7 +21,8 @@ #include <boost/config.hpp> #include <boost/serialization/collections_save_imp.hpp> -#include <boost/serialization/collections_load_imp.hpp> +#include <boost/serialization/detail/stack_constructor.hpp> +#include <boost/serialization/detail/is_default_constructible.hpp> #include <boost/serialization/split_free.hpp> namespace boost { @@ -44,14 +45,33 @@ inline void load( std::deque<U, Allocator> &t, const unsigned int /*file_version*/ ){ - boost::serialization::stl::load_collection< - Archive, - std::deque<U, Allocator>, - boost::serialization::stl::archive_input_seq< - Archive, std::deque<U, Allocator> - >, - boost::serialization::stl::no_reserve_imp<std::deque<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::deque<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 |