update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/boost/boost/atomic/detail/ops_gcc_ppc.hpp b/ceph/src/boost/boost/atomic/detail/ops_gcc_ppc.hpp
index a826736d17f7427a500d3440f158d6a1a4d30845..82c03101d828b09b3b3b933822762b133183b99a 100644 (file)
--- a/ceph/src/boost/boost/atomic/detail/ops_gcc_ppc.hpp
+++ b/ceph/src/boost/boost/atomic/detail/ops_gcc_ppc.hpp
@@ -19,7 +19,7 @@
 #include <cstddef>
 #include <boost/memory_order.hpp>
 #include <boost/atomic/detail/config.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/ops_gcc_ppc_common.hpp>
 #include <boost/atomic/capabilities.hpp>
@@ -83,10 +83,10 @@ template< bool Signed >
 struct operations< 4u, Signed > :
     public gcc_ppc_operations_base
 {
-    typedef typename make_storage_type< 4u >::type storage_type;
-    typedef typename make_storage_type< 4u >::aligned aligned_storage_type;
+    typedef typename storage_traits< 4u >::type storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 4u;
+    static BOOST_CONSTEXPR_OR_CONST std::size_t storage_alignment = 4u;
     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
@@ -303,7 +303,7 @@ struct operations< 4u, Signed > :
 
     static BOOST_FORCEINLINE void clear(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        store(storage, 0, order);
+        store(storage, (storage_type)0, order);
     }
 };
 
@@ -313,10 +313,10 @@ template< bool Signed >
 struct operations< 1u, Signed > :
     public gcc_ppc_operations_base
 {
-    typedef typename make_storage_type< 1u >::type storage_type;
-    typedef typename make_storage_type< 1u >::aligned aligned_storage_type;
+    typedef typename storage_traits< 1u >::type storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 1u;
+    static BOOST_CONSTEXPR_OR_CONST std::size_t storage_alignment = 1u;
     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
@@ -533,7 +533,7 @@ struct operations< 1u, Signed > :
 
     static BOOST_FORCEINLINE void clear(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        store(storage, 0, order);
+        store(storage, (storage_type)0, order);
     }
 };
 
@@ -643,10 +643,10 @@ template< bool Signed >
 struct operations< 2u, Signed > :
     public gcc_ppc_operations_base
 {
-    typedef typename make_storage_type< 2u >::type storage_type;
-    typedef typename make_storage_type< 2u >::aligned aligned_storage_type;
+    typedef typename storage_traits< 2u >::type storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 2u;
+    static BOOST_CONSTEXPR_OR_CONST std::size_t storage_alignment = 2u;
     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
@@ -863,7 +863,7 @@ struct operations< 2u, Signed > :
 
     static BOOST_FORCEINLINE void clear(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        store(storage, 0, order);
+        store(storage, (storage_type)0, order);
     }
 };
 
@@ -973,10 +973,10 @@ template< bool Signed >
 struct operations< 8u, Signed > :
     public gcc_ppc_operations_base
 {
-    typedef typename make_storage_type< 8u >::type storage_type;
-    typedef typename make_storage_type< 8u >::aligned aligned_storage_type;
+    typedef typename storage_traits< 8u >::type storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 8u;
+    static BOOST_CONSTEXPR_OR_CONST std::size_t storage_alignment = 8u;
     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
@@ -1193,7 +1193,7 @@ struct operations< 8u, Signed > :
 
     static BOOST_FORCEINLINE void clear(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        store(storage, 0, order);
+        store(storage, (storage_type)0, order);
     }
 };