boost/flyweight
2
0
Fork 0
mirror of https://github.com/boostorg/flyweight.git synced 2026-01-19 04:12:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove serialization includes

Browse Source
This commit is contained in:
Peter Dimov
2023-02-20 17:36:40 +02:00
parent 03952cf534
commit c15f7f021a
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/flyweight/detail/archive_constructed.hpp
View File

@@ -16,7 +16,7 @@
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
#include <boost/core/no_exceptions_support.hpp>
#include <boost/noncopyable.hpp>
#include <boost/serialization/serialization.hpp>
#include <boost/core/serialization.hpp>
#include <boost/type_traits/aligned_storage.hpp>
#include <boost/type_traits/alignment_of.hpp>
@@ -34,7 +34,7 @@ struct archive_constructed:private noncopyable
template<class Archive>
archive_constructed(Archive& ar,const unsigned int version)
{
serialization::load_construct_data_adl(ar,&get(),version);
core::load_construct_data_adl(ar,&get(),version);
BOOST_TRY{
ar>>get();
}
@@ -48,7 +48,7 @@ struct archive_constructed:private noncopyable
template<class Archive>
archive_constructed(const char* name,Archive& ar,const unsigned int version)
{
serialization::load_construct_data_adl(ar,&get(),version);
core::load_construct_data_adl(ar,&get(),version);
BOOST_TRY{
ar>>serialization::make_nvp(name,get());
}

1
include/boost/flyweight/detail/serialization_helper.hpp
View File

@@ -18,7 +18,6 @@
#include <boost/multi_index/hashed_index.hpp>
#include <boost/multi_index/random_access_index.hpp>
#include <boost/noncopyable.hpp>
#include <boost/serialization/extended_type_info.hpp>
#include <vector>
namespace boost{

16
include/boost/flyweight/serialize.hpp
View File

@@ -17,17 +17,17 @@
#include <boost/flyweight/flyweight_fwd.hpp>
#include <boost/flyweight/detail/archive_constructed.hpp>
#include <boost/flyweight/detail/serialization_helper.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/split_free.hpp>
#include <boost/throw_exception.hpp>
#include <boost/core/serialization.hpp>
#include <boost/throw_exception.hpp>
#include <memory>
#include <stdexcept>
/* Serialization routines for flyweight<T>.
*/
namespace boost{
namespace serialization{
namespace flyweights{
template<
class Archive,
@@ -37,7 +37,7 @@ inline void serialize(
Archive& ar,::boost::flyweights::flyweight<T,Arg1,Arg2,Arg3>& f,
const unsigned int version)
{
split_free(ar,f,version);
core::split_free(ar,f,version);
}
template<
@@ -81,7 +81,7 @@ void load(
ar>>make_nvp("item",n);
if(n>hlp.size()){
throw_exception(
archive::archive_exception(archive::archive_exception::other_exception));
std::runtime_error( "Invalid or corrupted archive" ) );
}
else if(n==hlp.size()){
::boost::flyweights::detail::archive_constructed<key_type> k(
@@ -91,7 +91,7 @@ void load(
f=hlp[n];
}
} /* namespace serialization */
} /* namespace flyweights */
} /* namespace boost */