Ticket #9426: boost_1_55_0_atomic_gcc_cas_no_opt.patch

boost_1_55_0/boost/atomic/detail/cas32strong.hpp

@@ -658 +658 @@
     }
 
     void
-    store(value_type const& v, memory_order order = memory_order_seq_cst) ) volatile BOOST_NOEXCEPT
+    store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
     {
         storage_type tmp = 0;
         memcpy(&tmp, &v, sizeof(value_type));
@@ -679 +679 @@
     }
 
     value_type
-    exchange(value_type const& v, memory_order order = memory_order_seq_cst) ) volatile BOOST_NOEXCEPT
+    exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
     {
         value_type original = load(memory_order_relaxed);
         do {
@@ -692 +692 @@
         value_type & expected,
         value_type const& desired,
         memory_order success_order,
-        memory_order failure_order) ) volatile BOOST_NOEXCEPT
+        memory_order failure_order) volatile BOOST_NOEXCEPT
     {
         return compare_exchange_strong(expected, desired, success_order, failure_order);
     }
@@ -702 +702 @@
         value_type & expected,
         value_type const& desired,
         memory_order success_order,
-        memory_order failure_order) ) volatile BOOST_NOEXCEPT
+        memory_order failure_order) volatile BOOST_NOEXCEPT
     {
         storage_type expected_s = 0, desired_s = 0;
         memcpy(&expected_s, &expected, sizeof(value_type));
@@ -755 +755 @@
     }
 
     void
-    store(value_type const& v, memory_order order = memory_order_seq_cst) ) volatile BOOST_NOEXCEPT
+    store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
     {
         storage_type tmp = 0;
         memcpy(&tmp, &v, sizeof(value_type));
@@ -776 +776 @@
     }
 
     value_type
-    exchange(value_type const& v, memory_order order = memory_order_seq_cst) ) volatile BOOST_NOEXCEPT
+    exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
     {
         value_type original = load(memory_order_relaxed);
         do {

boost_1_55_0/boost/atomic/detail/gcc-cas.hpp

@@ -104 +104 @@
     return success;
 }
 
+}
+}
+
 class atomic_flag
 {
 private:
@@ -129 +132 @@
         do {
             if (expected == 1)
                 break;
-        } while (!atomics::detail::platform_cmpxchg32(expected, (uint32_t)1, &v_));
+        } while (!atomics::detail::platform_cmpxchg32_strong(expected, (uint32_t)1, &v_));
         atomics::detail::platform_fence_after(order);
         return expected;
     }
@@ -138 +141 @@
 #define BOOST_ATOMIC_FLAG_LOCK_FREE 2
 
 }
-}
-}
 
 #include <boost/atomic/detail/base.hpp>
 
@@ -148 +149 @@
 #define BOOST_ATOMIC_CHAR_LOCK_FREE 2
 #define BOOST_ATOMIC_SHORT_LOCK_FREE 2
 #define BOOST_ATOMIC_INT_LOCK_FREE 2
-#define BOOST_ATOMIC_LONG_LOCK_FREE (sizeof(long) <= 4 ? 2 : 0)
-#define BOOST_ATOMIC_LLONG_LOCK_FREE (sizeof(long long) <= 4 ? 2 : 0)
-#define BOOST_ATOMIC_POINTER_LOCK_FREE (sizeof(void *) <= 4 ? 2 : 0)
+#define BOOST_ATOMIC_LONG_LOCK_FREE (__SIZEOF_LONG__ <= 4 ? 2 : 0)
+#define BOOST_ATOMIC_LLONG_LOCK_FREE (__SIZEOF_LONG_LONG__ <= 4 ? 2 : 0)
+#define BOOST_ATOMIC_POINTER_LOCK_FREE (__SIZEOF_POINTER__ <= 4 ? 2 : 0)
 #define BOOST_ATOMIC_BOOL_LOCK_FREE 2
 
 #include <boost/atomic/detail/cas32strong.hpp>

boost_1_55_0/boost/atomic/detail/platform.hpp

@@ -57 +57 @@
 
     #include <boost/atomic/detail/windows.hpp>
 
-#elif 0 && defined(__GNUC__) /* currently does not work correctly */
+#elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 401)
 
-    #include <boost/atomic/detail/base.hpp>
     #include <boost/atomic/detail/gcc-cas.hpp>
 
 #else