summaryrefslogtreecommitdiff
path: root/boost/serialization/set.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/serialization/set.hpp')
-rw-r--r--boost/serialization/set.hpp59
1 files changed, 37 insertions, 22 deletions
diff --git a/boost/serialization/set.hpp b/boost/serialization/set.hpp
index 6882fb0..01289d5 100644
--- a/boost/serialization/set.hpp
+++ b/boost/serialization/set.hpp
@@ -9,7 +9,7 @@
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
// set.hpp: serialization for stl set templates
-// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// (C) Copyright 2002-2014 Robert Ramey - http://www.rrsd.com .
// Use, modification and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -20,13 +20,46 @@
#include <boost/config.hpp>
+#include <boost/archive/detail/basic_iarchive.hpp>
+#include <boost/serialization/access.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/detail/stack_constructor.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>
namespace boost {
namespace serialization {
+template<class Archive, class Container>
+inline void load_set_collection(Archive & ar, Container &s)
+{
+ s.clear();
+ 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);
+ }
+ typename Container::iterator hint;
+ hint = s.begin();
+ while(count-- > 0){
+ typedef typename Container::value_type type;
+ detail::stack_construct<Archive, type> t(ar, item_version);
+ // borland fails silently w/o full namespace
+ ar >> boost::serialization::make_nvp("item", t.reference());
+ typename Container::iterator result = s.insert(hint, t.reference());
+ ar.reset_object_address(& (* result), & t.reference());
+ hint = result;
+ }
+}
+
template<class Archive, class Key, class Compare, class Allocator >
inline void save(
Archive & ar,
@@ -44,16 +77,7 @@ inline void load(
std::set<Key, Compare, Allocator> &t,
const unsigned int /* file_version */
){
- boost::serialization::stl::load_collection<
- Archive,
- std::set<Key, Compare, Allocator>,
- boost::serialization::stl::archive_input_set<
- Archive, std::set<Key, Compare, Allocator>
- >,
- boost::serialization::stl::no_reserve_imp<std::set<
- Key, Compare, Allocator>
- >
- >(ar, t);
+ load_set_collection(ar, t);
}
// split non-intrusive serialization function member into separate
@@ -86,16 +110,7 @@ inline void load(
std::multiset<Key, Compare, Allocator> &t,
const unsigned int /* file_version */
){
- boost::serialization::stl::load_collection<
- Archive,
- std::multiset<Key, Compare, Allocator>,
- boost::serialization::stl::archive_input_set<
- Archive, std::multiset<Key, Compare, Allocator>
- >,
- boost::serialization::stl::no_reserve_imp<
- std::multiset<Key, Compare, Allocator>
- >
- >(ar, t);
+ load_set_collection(ar, t);
}
// split non-intrusive serialization function member into separate