diff options
Diffstat (limited to 'boost/archive/impl/xml_wiarchive_impl.ipp')
-rw-r--r-- | boost/archive/impl/xml_wiarchive_impl.ipp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/boost/archive/impl/xml_wiarchive_impl.ipp b/boost/archive/impl/xml_wiarchive_impl.ipp index 257b57590d..a837347edb 100644 --- a/boost/archive/impl/xml_wiarchive_impl.ipp +++ b/boost/archive/impl/xml_wiarchive_impl.ipp @@ -28,7 +28,6 @@ namespace std{ #include <boost/io/ios_state.hpp> #include <boost/core/no_exceptions_support.hpp> -#include <boost/serialization/pfto.hpp> #include <boost/serialization/string.hpp> #include <boost/archive/basic_xml_archive.hpp> @@ -52,10 +51,10 @@ namespace { // anonymous void copy_to_ptr(char * s, const std::wstring & ws){ std::copy( iterators::mb_from_wchar<std::wstring::const_iterator>( - BOOST_MAKE_PFTO_WRAPPER(ws.begin()) + ws.begin() ), iterators::mb_from_wchar<std::wstring::const_iterator>( - BOOST_MAKE_PFTO_WRAPPER(ws.end()) + ws.end() ), s ); @@ -65,7 +64,7 @@ void copy_to_ptr(char * s, const std::wstring & ws){ } // anonymous template<class Archive> -BOOST_WARCHIVE_DECL(void) +BOOST_WARCHIVE_DECL void xml_wiarchive_impl<Archive>::load(std::string & s){ std::wstring ws; bool result = gimpl->parse_string(is, ws); @@ -80,10 +79,10 @@ xml_wiarchive_impl<Archive>::load(std::string & s){ s.reserve(ws.size()); std::copy( iterators::mb_from_wchar<std::wstring::iterator>( - BOOST_MAKE_PFTO_WRAPPER(ws.begin()) + ws.begin() ), iterators::mb_from_wchar<std::wstring::iterator>( - BOOST_MAKE_PFTO_WRAPPER(ws.end()) + ws.end() ), std::back_inserter(s) ); @@ -91,7 +90,7 @@ xml_wiarchive_impl<Archive>::load(std::string & s){ #ifndef BOOST_NO_STD_WSTRING template<class Archive> -BOOST_WARCHIVE_DECL(void) +BOOST_WARCHIVE_DECL void xml_wiarchive_impl<Archive>::load(std::wstring & ws){ bool result = gimpl->parse_string(is, ws); if(! result) @@ -102,7 +101,7 @@ xml_wiarchive_impl<Archive>::load(std::wstring & ws){ #endif template<class Archive> -BOOST_WARCHIVE_DECL(void) +BOOST_WARCHIVE_DECL void xml_wiarchive_impl<Archive>::load(char * s){ std::wstring ws; bool result = gimpl->parse_string(is, ws); @@ -115,7 +114,7 @@ xml_wiarchive_impl<Archive>::load(char * s){ #ifndef BOOST_NO_INTRINSIC_WCHAR_T template<class Archive> -BOOST_WARCHIVE_DECL(void) +BOOST_WARCHIVE_DECL void xml_wiarchive_impl<Archive>::load(wchar_t * ws){ std::wstring twstring; bool result = gimpl->parse_string(is, twstring); @@ -129,8 +128,8 @@ xml_wiarchive_impl<Archive>::load(wchar_t * ws){ #endif template<class Archive> -BOOST_WARCHIVE_DECL(void) -xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){ +BOOST_WARCHIVE_DECL void +xml_wiarchive_impl<Archive>::load_override(class_name_type & t){ const std::wstring & ws = gimpl->rv.class_name; if(ws.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1) boost::serialization::throw_exception( @@ -140,7 +139,7 @@ xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){ } template<class Archive> -BOOST_WARCHIVE_DECL(void) +BOOST_WARCHIVE_DECL void xml_wiarchive_impl<Archive>::init(){ gimpl->init(is); this->set_library_version( @@ -149,7 +148,7 @@ xml_wiarchive_impl<Archive>::init(){ } template<class Archive> -BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) +BOOST_WARCHIVE_DECL xml_wiarchive_impl<Archive>::xml_wiarchive_impl( std::wistream &is_, unsigned int flags @@ -177,7 +176,7 @@ xml_wiarchive_impl<Archive>::xml_wiarchive_impl( } template<class Archive> -BOOST_WARCHIVE_DECL(BOOST_PP_EMPTY()) +BOOST_WARCHIVE_DECL xml_wiarchive_impl<Archive>::~xml_wiarchive_impl(){ if(0 == (this->get_flags() & no_header)){ BOOST_TRY{ |