import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / archive / impl / basic_text_iarchive.ipp

diff --git a/ceph/src/boost/boost/archive/impl/basic_text_iarchive.ipp b/ceph/src/boost/boost/archive/impl/basic_text_iarchive.ipp
index 9ec8c6588c88393f6bfef4890d56b9a39c787ac4..3e2def9520554f0d784441ce44cedde7e9fa151c 100644 (file)
--- a/ceph/src/boost/boost/archive/impl/basic_text_iarchive.ipp
+++ b/ceph/src/boost/boost/archive/impl/basic_text_iarchive.ipp
@@ -45,7 +45,7 @@ basic_text_iarchive<Archive>::load_override(class_name_type & t){
 
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-basic_text_iarchive<Archive>::init(void){
+basic_text_iarchive<Archive>::init() {
     // read signature in an archive version independent manner
     std::string file_signature;
     * this->This() >> file_signature;
@@ -56,7 +56,7 @@ basic_text_iarchive<Archive>::init(void){
 
     // make sure the version of the reading archive library can
     // support the format of the archive being read
-    library_version_type input_library_version;
+    boost::serialization::library_version_type input_library_version;
     * this->This() >> input_library_version;
 
     #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))