update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/boost/boost/atomic/detail/ops_gcc_x86.hpp b/ceph/src/boost/boost/atomic/detail/ops_gcc_x86.hpp
index baf4d5757d7ed5591155a200063478419e9e220d..007d4eeeebcafe9cf794b074441a41e1982fddb6 100644 (file)
--- a/ceph/src/boost/boost/atomic/detail/ops_gcc_x86.hpp
+++ b/ceph/src/boost/boost/atomic/detail/ops_gcc_x86.hpp
@@ -37,17 +37,18 @@ namespace detail {
 
 struct gcc_x86_operations_base
 {
+    static BOOST_CONSTEXPR_OR_CONST bool full_cas_based = false;
     static BOOST_CONSTEXPR_OR_CONST bool is_always_lock_free = true;
 
     static BOOST_FORCEINLINE void fence_before(memory_order order) BOOST_NOEXCEPT
     {
-        if ((order & memory_order_release) != 0)
+        if ((static_cast< unsigned int >(order) & static_cast< unsigned int >(memory_order_release)) != 0u)
             __asm__ __volatile__ ("" ::: "memory");
     }
 
     static BOOST_FORCEINLINE void fence_after(memory_order order) BOOST_NOEXCEPT
     {
-        if ((order & memory_order_acquire) != 0)
+        if ((static_cast< unsigned int >(order) & (static_cast< unsigned int >(memory_order_consume) | static_cast< unsigned int >(memory_order_acquire))) != 0u)
             __asm__ __volatile__ ("" ::: "memory");
     }
 };
@@ -56,7 +57,7 @@ template< std::size_t Size, bool Signed, typename Derived >
 struct gcc_x86_operations :
     public gcc_x86_operations_base
 {
-    typedef typename make_storage_type< Size, Signed >::type storage_type;
+    typedef typename make_storage_type< Size >::type storage_type;
 
     static BOOST_FORCEINLINE void store(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
@@ -107,8 +108,8 @@ struct operations< 1u, Signed > :
 {
     typedef gcc_x86_operations< 1u, Signed, operations< 1u, Signed > > base_type;
     typedef typename base_type::storage_type storage_type;
-    typedef typename make_storage_type< 1u, Signed >::aligned aligned_storage_type;
-    typedef typename make_storage_type< 4u, Signed >::type temp_storage_type;
+    typedef typename make_storage_type< 1u >::aligned aligned_storage_type;
+    typedef typename make_storage_type< 4u >::type temp_storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 1u;
     static BOOST_CONSTEXPR_OR_CONST bool is_signed = Signed;
@@ -208,8 +209,8 @@ struct operations< 2u, Signed > :
 {
     typedef gcc_x86_operations< 2u, Signed, operations< 2u, Signed > > base_type;
     typedef typename base_type::storage_type storage_type;
-    typedef typename make_storage_type< 2u, Signed >::aligned aligned_storage_type;
-    typedef typename make_storage_type< 4u, Signed >::type temp_storage_type;
+    typedef typename make_storage_type< 2u >::aligned aligned_storage_type;
+    typedef typename make_storage_type< 4u >::type temp_storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 2u;
     static BOOST_CONSTEXPR_OR_CONST bool is_signed = Signed;
@@ -309,7 +310,7 @@ struct operations< 4u, Signed > :
 {
     typedef gcc_x86_operations< 4u, Signed, operations< 4u, Signed > > base_type;
     typedef typename base_type::storage_type storage_type;
-    typedef typename make_storage_type< 4u, Signed >::aligned aligned_storage_type;
+    typedef typename make_storage_type< 4u >::aligned aligned_storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 4u;
     static BOOST_CONSTEXPR_OR_CONST bool is_signed = Signed;
@@ -421,7 +422,7 @@ struct operations< 8u, Signed > :
 {
     typedef gcc_x86_operations< 8u, Signed, operations< 8u, Signed > > base_type;
     typedef typename base_type::storage_type storage_type;
-    typedef typename make_storage_type< 8u, Signed >::aligned aligned_storage_type;
+    typedef typename make_storage_type< 8u >::aligned aligned_storage_type;
 
     static BOOST_CONSTEXPR_OR_CONST std::size_t storage_size = 8u;
     static BOOST_CONSTEXPR_OR_CONST bool is_signed = Signed;
@@ -543,7 +544,7 @@ BOOST_FORCEINLINE void thread_fence(memory_order order) BOOST_NOEXCEPT
             ::: "memory"
         );
     }
-    else if ((order & (memory_order_acquire | memory_order_release)) != 0)
+    else if ((static_cast< unsigned int >(order) & (static_cast< unsigned int >(memory_order_acquire) | static_cast< unsigned int >(memory_order_release))) != 0u)
     {
         __asm__ __volatile__ ("" ::: "memory");
     }