update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / atomic / detail / ops_windows.hpp

diff --git a/ceph/src/boost/boost/atomic/detail/ops_windows.hpp b/ceph/src/boost/boost/atomic/detail/ops_windows.hpp
index d4ce6d95e71c8f604bc98b176897cef212f687ce..5170a64c3fa6aa6a9eb7bfee4e343cee41e796aa 100644 (file)
--- a/ceph/src/boost/boost/atomic/detail/ops_windows.hpp
+++ b/ceph/src/boost/boost/atomic/detail/ops_windows.hpp
@@ -27,7 +27,7 @@
 #include <boost/memory_order.hpp>
 #include <boost/atomic/detail/config.hpp>
 #include <boost/atomic/detail/interlocked.hpp>
-#include <boost/atomic/detail/storage_type.hpp>
+#include <boost/atomic/detail/storage_traits.hpp>
 #include <boost/atomic/detail/operations_fwd.hpp>
 #include <boost/atomic/detail/type_traits/make_signed.hpp>
 #include <boost/atomic/capabilities.hpp>
@@ -68,10 +68,10 @@ template< std::size_t Size, bool Signed, typename Derived >
 struct windows_operations :
     public windows_operations_base
 {
-    typedef typename make_storage_type< Size >::type storage_type;
-    typedef typename make_storage_type< Size >::aligned aligned_storage_type;
+    typedef typename storage_traits< Size >::type storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = Size;
+    static BOOST_CONSTEXPR_OR_CONST std::size_t storage_alignment = storage_traits< Size >::alignment;
     static BOOST_CONSTEXPR_OR_CONST bool is_signed = Signed;
 
     static BOOST_FORCEINLINE void store(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT