From a3781c5b770c03ff32c5cf8f1280b21c2a8e2626 Mon Sep 17 00:00:00 2001 From: Kevin Smith <git@kismith.co.uk> Date: Mon, 30 Sep 2013 13:50:39 +0100 Subject: Provide map serialization. Needed for Tobias's upcoming patch Change-Id: Ie3a86f17338c053c80f7d02e696b9fe92741beba diff --git a/3rdParty/Boost/src/boost/serialization/map.hpp b/3rdParty/Boost/src/boost/serialization/map.hpp new file mode 100644 index 0000000..624290d --- /dev/null +++ b/3rdParty/Boost/src/boost/serialization/map.hpp @@ -0,0 +1,118 @@ +#ifndef BOOST_SERIALIZATION_MAP_HPP +#define BOOST_SERIALIZATION_MAP_HPP + +// MS compatible compilers support #pragma once +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once +#endif + +/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 +// serialization/map.hpp: +// serialization for stl map templates + +// (C) Copyright 2002 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) + +// See http://www.boost.org for updates, documentation, and revision history. + +#include <map> + +#include <boost/config.hpp> + +#include <boost/serialization/utility.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 Type, class Key, class Compare, class Allocator > +inline void save( + Archive & ar, + const std::map<Key, Type, Compare, Allocator> &t, + const unsigned int /* file_version */ +){ + boost::serialization::stl::save_collection< + Archive, + std::map<Key, Type, Compare, Allocator> + >(ar, t); +} + +template<class Archive, class Type, class Key, class Compare, class Allocator > +inline void load( + Archive & ar, + std::map<Key, Type, Compare, Allocator> &t, + const unsigned int /* file_version */ +){ + boost::serialization::stl::load_collection< + Archive, + std::map<Key, Type, Compare, Allocator>, + boost::serialization::stl::archive_input_map< + Archive, std::map<Key, Type, Compare, Allocator> >, + boost::serialization::stl::no_reserve_imp<std::map< + Key, Type, Compare, Allocator + > + > + >(ar, t); +} + +// split non-intrusive serialization function member into separate +// non intrusive save/load member functions +template<class Archive, class Type, class Key, class Compare, class Allocator > +inline void serialize( + Archive & ar, + std::map<Key, Type, Compare, Allocator> &t, + const unsigned int file_version +){ + boost::serialization::split_free(ar, t, file_version); +} + +// multimap +template<class Archive, class Type, class Key, class Compare, class Allocator > +inline void save( + Archive & ar, + const std::multimap<Key, Type, Compare, Allocator> &t, + const unsigned int /* file_version */ +){ + boost::serialization::stl::save_collection< + Archive, + std::multimap<Key, Type, Compare, Allocator> + >(ar, t); +} + +template<class Archive, class Type, class Key, class Compare, class Allocator > +inline void load( + Archive & ar, + std::multimap<Key, Type, Compare, Allocator> &t, + const unsigned int /* file_version */ +){ + boost::serialization::stl::load_collection< + Archive, + std::multimap<Key, Type, Compare, Allocator>, + boost::serialization::stl::archive_input_map< + Archive, std::multimap<Key, Type, Compare, Allocator> + >, + boost::serialization::stl::no_reserve_imp< + std::multimap<Key, Type, Compare, Allocator> + > + >(ar, t); +} + +// split non-intrusive serialization function member into separate +// non intrusive save/load member functions +template<class Archive, class Type, class Key, class Compare, class Allocator > +inline void serialize( + Archive & ar, + std::multimap<Key, Type, Compare, Allocator> &t, + const unsigned int file_version +){ + boost::serialization::split_free(ar, t, file_version); +} + +} // serialization +} // namespace boost + +#endif // BOOST_SERIALIZATION_MAP_HPP diff --git a/3rdParty/Boost/src/boost/serialization/utility.hpp b/3rdParty/Boost/src/boost/serialization/utility.hpp new file mode 100644 index 0000000..3d69abc --- /dev/null +++ b/3rdParty/Boost/src/boost/serialization/utility.hpp @@ -0,0 +1,56 @@ +#ifndef BOOST_SERIALIZATION_UTILITY_HPP +#define BOOST_SERIALIZATION_UTILITY_HPP + +// MS compatible compilers support #pragma once +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once +#endif + +/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 +// serialization/utility.hpp: +// serialization for stl utility templates + +// (C) Copyright 2002 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) + +// See http://www.boost.org for updates, documentation, and revision history. + +#include <utility> +#include <boost/config.hpp> + +#include <boost/type_traits/remove_const.hpp> +#include <boost/serialization/nvp.hpp> +#include <boost/serialization/is_bitwise_serializable.hpp> +#include <boost/mpl/and.hpp> + +namespace boost { +namespace serialization { + +// pair +template<class Archive, class F, class S> +inline void serialize( + Archive & ar, + std::pair<F, S> & p, + const unsigned int /* file_version */ +){ + // note: we remove any const-ness on the first argument. The reason is that + // for stl maps, the type saved is pair<const key, T). We remove + // the const-ness in order to be able to load it. + typedef BOOST_DEDUCED_TYPENAME boost::remove_const<F>::type typef; + ar & boost::serialization::make_nvp("first", const_cast<typef &>(p.first)); + ar & boost::serialization::make_nvp("second", p.second); +} + +/// specialization of is_bitwise_serializable for pairs +template <class T, class U> +struct is_bitwise_serializable<std::pair<T,U> > + : public mpl::and_<is_bitwise_serializable< T >,is_bitwise_serializable<U> > +{ +}; + +} // serialization +} // namespace boost + +#endif // BOOST_SERIALIZATION_UTILITY_HPP diff --git a/3rdParty/Boost/update.sh b/3rdParty/Boost/update.sh index 492ff20..7996dfb 100755 --- a/3rdParty/Boost/update.sh +++ b/3rdParty/Boost/update.sh @@ -44,6 +44,7 @@ fi serialization/serialization.hpp \ serialization/vector.hpp \ serialization/list.hpp \ + serialization/map.hpp \ serialization/shared_ptr.hpp \ serialization/string.hpp \ serialization/set.hpp \ -- cgit v0.10.2-6-g49f6