diff options
Diffstat (limited to 'boost/archive/basic_binary_oarchive.hpp')
| -rw-r--r-- | boost/archive/basic_binary_oarchive.hpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/boost/archive/basic_binary_oarchive.hpp b/boost/archive/basic_binary_oarchive.hpp index f8b53e9d7c..f05f2f86d5 100644 --- a/boost/archive/basic_binary_oarchive.hpp +++ b/boost/archive/basic_binary_oarchive.hpp @@ -26,7 +26,6 @@ #include <boost/assert.hpp> #include <boost/config.hpp> #include <boost/detail/workaround.hpp> -#include <boost/serialization/pfto.hpp> #include <boost/integer.hpp> #include <boost/integer_traits.hpp> @@ -59,8 +58,8 @@ namespace detail { // does have the virtue of buiding the smalles archive in the minimum amount // of time. So under some circumstances it may be he right choice. template<class Archive> -class basic_binary_oarchive : - public archive::detail::common_oarchive<Archive> +class BOOST_SYMBOL_VISIBLE basic_binary_oarchive : + public detail::common_oarchive<Archive> { #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS public: @@ -77,8 +76,8 @@ protected: // any datatype not specifed below will be handled by base class typedef detail::common_oarchive<Archive> detail_common_oarchive; template<class T> - void save_override(const T & t, BOOST_PFTO int version){ - this->detail_common_oarchive::save_override(t, static_cast<int>(version)); + void save_override(const T & t){ + this->detail_common_oarchive::save_override(t); } // include these to trap a change in binary format which @@ -92,14 +91,14 @@ protected: BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t)); // binary files don't include the optional information - void save_override(const class_id_optional_type & /* t */, int){} + void save_override(const class_id_optional_type & /* t */){} // enable this if we decide to support generation of previous versions #if 0 - void save_override(const boost::archive::version_type & t, int version){ + void save_override(const boost::archive::version_type & t){ library_version_type lvt = this->get_library_version(); if(boost::archive::library_version_type(7) < lvt){ - this->detail_common_oarchive::save_override(t, version); + this->detail_common_oarchive::save_override(t); } else if(boost::archive::library_version_type(6) < lvt){ @@ -111,10 +110,10 @@ protected: * this->This() << x; } } - void save_override(const boost::serialization::item_version_type & t, int version){ + void save_override(const boost::serialization::item_version_type & t){ library_version_type lvt = this->get_library_version(); if(boost::archive::library_version_type(7) < lvt){ - this->detail_common_oarchive::save_override(t, version); + this->detail_common_oarchive::save_override(t); } else if(boost::archive::library_version_type(6) < lvt){ @@ -127,10 +126,10 @@ protected: } } - void save_override(class_id_type & t, int version){ + void save_override(class_id_type & t){ library_version_type lvt = this->get_library_version(); if(boost::archive::library_version_type(7) < lvt){ - this->detail_common_oarchive::save_override(t, version); + this->detail_common_oarchive::save_override(t); } else if(boost::archive::library_version_type(6) < lvt){ @@ -142,20 +141,20 @@ protected: * this->This() << x; } } - void save_override(class_id_reference_type & t, int version){ - save_override(static_cast<class_id_type &>(t), version); + void save_override(class_id_reference_type & t){ + save_override(static_cast<class_id_type &>(t)); } #endif // explicitly convert to char * to avoid compile ambiguities - void save_override(const class_name_type & t, int){ + void save_override(const class_name_type & t){ const std::string s(t); * this->This() << s; } #if 0 - void save_override(const serialization::collection_size_type & t, int){ + void save_override(const serialization::collection_size_type & t){ if (get_library_version() < boost::archive::library_version_type(6)){ unsigned int x=0; * this->This() >> x; @@ -166,7 +165,7 @@ protected: } } #endif - BOOST_ARCHIVE_OR_WARCHIVE_DECL(void) + BOOST_ARCHIVE_OR_WARCHIVE_DECL void init(); basic_binary_oarchive(unsigned int flags) : |