import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / serialization / hash_collections_load_imp.hpp

diff --git a/ceph/src/boost/boost/serialization/hash_collections_load_imp.hpp b/ceph/src/boost/boost/serialization/hash_collections_load_imp.hpp
index 1a2417e85c6514f23fa7997682fb87d2553e5314..4b7259d42ec9f2aee869657f1d87fa49823ce5e8 100644 (file)
--- a/ceph/src/boost/boost/serialization/hash_collections_load_imp.hpp
+++ b/ceph/src/boost/boost/serialization/hash_collections_load_imp.hpp
@@ -19,10 +19,10 @@
 
 // helper function templates for serialization of hashed collections
 #include <boost/config.hpp>
-#include <boost/archive/detail/basic_iarchive.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/collection_size_type.hpp>
 #include <boost/serialization/item_version_type.hpp>
+#include <boost/serialization/library_version_type.hpp>
 
 namespace boost{
 namespace serialization {
@@ -37,11 +37,11 @@ inline void load_hash_collection(Archive & ar, Container &s)
     collection_size_type count;
     collection_size_type bucket_count;
     boost::serialization::item_version_type item_version(0);
-    boost::archive::library_version_type library_version(
+    boost::serialization::library_version_type library_version(
         ar.get_library_version()
     );
     // retrieve number of elements
-    if(boost::archive::library_version_type(6) != library_version){
+    if(boost::serialization::library_version_type(6) != library_version){
         ar >> BOOST_SERIALIZATION_NVP(count);
         ar >> BOOST_SERIALIZATION_NVP(bucket_count);
     }
@@ -57,7 +57,7 @@ inline void load_hash_collection(Archive & ar, Container &s)
         ar >> BOOST_SERIALIZATION_NVP(bc);
         bucket_count = bc;
     }
-    if(boost::archive::library_version_type(3) < library_version){
+    if(boost::serialization::library_version_type(3) < library_version){
         ar >> BOOST_SERIALIZATION_NVP(item_version);
     }
     s.clear();