Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-05-29 15:56:31 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-05-29 15:56:31 (GMT) |
| commit | ab612d0f18ff545b4ebcb2bf2bb400996e751181 (patch) | |
| tree | 8c363717b5ff294c12d6ea23924d75ac13dba24f | |
| parent | 058719296f496b14b906fdee3d74d72a78d9f6a2 (diff) | |
| download | swift-contrib-ab612d0f18ff545b4ebcb2bf2bb400996e751181.zip swift-contrib-ab612d0f18ff545b4ebcb2bf2bb400996e751181.tar.bz2 | |
Add boost::optional serialization
Needed by one of Richard's pending patches
Change-Id: I64f6ab56065a51019a2d0c826e1bde6856970994
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/optional.hpp | 127 | ||||
| -rwxr-xr-x | 3rdParty/Boost/update.sh | 1 |
2 files changed, 128 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/optional.hpp b/3rdParty/Boost/src/boost/serialization/optional.hpp new file mode 100644 index 0000000..929fa07 --- /dev/null +++ b/3rdParty/Boost/src/boost/serialization/optional.hpp @@ -0,0 +1,127 @@ +/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 + +// (C) Copyright 2002-4 Pavel Vozenilek . +// 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) + +// Provides non-intrusive serialization for boost::optional. + +#ifndef BOOST_SERIALIZATION_OPTIONAL_HPP_ +#define BOOST_SERIALIZATION_OPTIONAL_HPP_ + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once +#endif + +#include <boost/config.hpp> + +#include <boost/archive/detail/basic_iarchive.hpp> + +#include <boost/optional.hpp> +#include <boost/serialization/item_version_type.hpp> +#include <boost/serialization/split_free.hpp> +#include <boost/serialization/level.hpp> +#include <boost/serialization/nvp.hpp> +#include <boost/serialization/version.hpp> +#include <boost/serialization/detail/stack_constructor.hpp> + +// function specializations must be defined in the appropriate +// namespace - boost::serialization +namespace boost { +namespace serialization { + +template<class Archive, class T> +void save( + Archive & ar, + const boost::optional< T > & t, + const unsigned int /*version*/ +){ + const bool tflag = t.is_initialized(); + ar << boost::serialization::make_nvp("initialized", tflag); + if (tflag){ + const boost::serialization::item_version_type item_version(version< T >::value); + #if 0 + const boost::archive::library_version_type library_version( + ar.get_library_version() + }; + if(boost::archive::library_version_type(3) < library_version){ + ar << BOOST_SERIALIZATION_NVP(item_version); + } + #else + ar << BOOST_SERIALIZATION_NVP(item_version); + #endif + ar << boost::serialization::make_nvp("value", *t); + } +} + +template<class Archive, class T> +void load( + Archive & ar, + boost::optional< T > & t, + const unsigned int /*version*/ +){ + bool tflag; + ar >> boost::serialization::make_nvp("initialized", tflag); + if (tflag){ + boost::serialization::item_version_type item_version(0); + boost::archive::library_version_type library_version( + ar.get_library_version() + ); + if(boost::archive::library_version_type(3) < library_version){ + // item_version is handled as an attribute so it doesnt need an NVP + ar >> BOOST_SERIALIZATION_NVP(item_version); + } + detail::stack_construct<Archive, T> aux(ar, item_version); + ar >> boost::serialization::make_nvp("value", aux.reference()); + t.reset(aux.reference()); + } + else { + t.reset(); + } +} + +template<class Archive, class T> +void serialize( + Archive & ar, + boost::optional< T > & t, + const unsigned int version +){ + boost::serialization::split_free(ar, t, version); +} + +// the following would be slightly more efficient. But it +// would mean that archives created with programs that support +// TPS wouldn't be readable by programs that don't support TPS. +// Hence we decline to support this otherwise convenient optimization. +//#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#if 0 + +template <class T> +struct implementation_level<optional< T > > +{ + typedef mpl::integral_c_tag tag; + typedef mpl::int_<boost::serialization::object_serializable> type; + BOOST_STATIC_CONSTANT( + int , + value = boost::serialization::implementation_level::type::value + ); +}; + +template<class T> +struct tracking_level<optional< T > > +{ + typedef mpl::integral_c_tag tag; + typedef mpl::int_<boost::serialization::track_never> type; + BOOST_STATIC_CONSTANT( + int , + value = boost::serialization::tracking_level::type::value + ); +}; + +#endif + +} // serialization +} // namespace boost + +#endif // BOOST_SERIALIZATION_OPTIONAL_HPP_ diff --git a/3rdParty/Boost/update.sh b/3rdParty/Boost/update.sh index 7996dfb..2fe348c 100755 --- a/3rdParty/Boost/update.sh +++ b/3rdParty/Boost/update.sh @@ -50,6 +50,7 @@ fi serialization/set.hpp \ serialization/version.hpp \ serialization/split_member.hpp \ + serialization/optional.hpp \ signals.hpp \ thread.hpp \ unordered_map.hpp \ |