import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / smart_ptr / atomic_shared_ptr.hpp

diff --git a/ceph/src/boost/boost/smart_ptr/atomic_shared_ptr.hpp b/ceph/src/boost/boost/smart_ptr/atomic_shared_ptr.hpp
index 7c485070f832d088f35540f6b62954dd091c3250..b863100e537bccf35cc63306d114d30c0939960c 100644 (file)
--- a/ceph/src/boost/boost/smart_ptr/atomic_shared_ptr.hpp
+++ b/ceph/src/boost/boost/smart_ptr/atomic_shared_ptr.hpp
@@ -63,6 +63,11 @@ public:
     {
     }
 
+    atomic_shared_ptr( shared_ptr<T> p ) BOOST_SP_NOEXCEPT
+        : p_( std::move( p ) ), l_ BOOST_DETAIL_SPINLOCK_INIT
+    {
+    }
+
 #else
 
     atomic_shared_ptr() BOOST_SP_NOEXCEPT
@@ -71,8 +76,6 @@ public:
         std::memcpy( &l_, &init, sizeof( init ) );
     }
 
-#endif
-
     atomic_shared_ptr( shared_ptr<T> p ) BOOST_SP_NOEXCEPT
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
         : p_( std::move( p ) )
@@ -84,6 +87,8 @@ public:
         std::memcpy( &l_, &init, sizeof( init ) );
     }
 
+#endif
+
     atomic_shared_ptr& operator=( shared_ptr<T> r ) BOOST_SP_NOEXCEPT
     {
         boost::detail::spinlock::scoped_lock lock( l_ );