update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / assign / ptr_list_of.hpp

diff --git a/ceph/src/boost/boost/assign/ptr_list_of.hpp b/ceph/src/boost/boost/assign/ptr_list_of.hpp
index 0ea6cd208b9c2097881b983cbdc1c15e2b0aa7f2..082f3725f1f4dc9bd081f030ef2c511631778a02 100644 (file)
--- a/ceph/src/boost/boost/assign/ptr_list_of.hpp
+++ b/ceph/src/boost/boost/assign/ptr_list_of.hpp
@@ -47,7 +47,11 @@ namespace assign_detail
     {
     protected:
         typedef boost::ptr_vector<T>       impl_type;
+#if defined(BOOST_NO_AUTO_PTR)
+        typedef std::unique_ptr<impl_type> release_type;
+#else
         typedef std::auto_ptr<impl_type>   release_type;
+#endif 
         mutable impl_type                  values_;
         
     public:
@@ -92,9 +96,18 @@ namespace assign_detail
         }
 
         template< class PtrContainer >
-        std::auto_ptr<PtrContainer> convert( const PtrContainer* c ) const
+#if defined(BOOST_NO_AUTO_PTR)
+        std::unique_ptr<PtrContainer>
+#else
+        std::auto_ptr<PtrContainer>
+#endif 
+               convert( const PtrContainer* c ) const
         {
+#if defined(BOOST_NO_AUTO_PTR)
+            std::unique_ptr<PtrContainer> res( new PtrContainer() );
+#else
             std::auto_ptr<PtrContainer> res( new PtrContainer() );
+#endif 
             while( !empty() )
                 res->insert( res->end(), 
                              values_.pop_back().release() );
@@ -102,7 +115,12 @@ namespace assign_detail
         }
 
         template< class PtrContainer >
-        std::auto_ptr<PtrContainer> to_container( const PtrContainer& c ) const
+#if defined(BOOST_NO_AUTO_PTR)
+        std::unique_ptr<PtrContainer>
+#else
+        std::auto_ptr<PtrContainer>
+#endif 
+        to_container( const PtrContainer& c ) const
         {
             return convert( &c ); 
         }