Ticket #8057: 8057.patch

boost/atomic/detail/base.hpp

@@ -143 +143 @@
     typedef T value_type;
     typedef lockpool::scoped_lock guard_type;
 public:
-    base_atomic(void) {}
+    BOOST_CONSTEXPR base_atomic(void) BOOST_NOEXCEPT {}
 
-    explicit base_atomic(const value_type & v)
+    explicit BOOST_CONSTEXPR base_atomic(const value_type & v) BOOST_NOEXCEPT  : v_(v)
     {
-        memcpy(&v_, &v, sizeof(value_type));
+        //memcpy(&v_, &v, sizeof(value_type));
     }
 
     void
@@ -216 +216 @@
 
     BOOST_ATOMIC_DECLARE_BASE_OPERATORS
 private:
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+    base_atomic(const base_atomic &) = delete;
+    void operator=(const base_atomic &) = delete;
+#else
     base_atomic(const base_atomic &) /* = delete */ ;
     void operator=(const base_atomic &) /* = delete */ ;
-
+#endif
     char v_[sizeof(value_type)];
 };
 
@@ -230 +234 @@
     typedef T difference_type;
     typedef lockpool::scoped_lock guard_type;
 public:
-    explicit base_atomic(value_type v) : v_(v) {}
-    base_atomic(void) {}
+    explicit BOOST_CONSTEXPR base_atomic(value_type v) BOOST_NOEXCEPT : v_(v) {}
+    BOOST_CONSTEXPR base_atomic(void) BOOST_NOEXCEPT {}
 
     void
     store(value_type v, memory_order /*order*/ = memory_order_seq_cst) volatile
@@ -342 +346 @@
 
     BOOST_ATOMIC_DECLARE_INTEGRAL_OPERATORS
 private:
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+    base_atomic(const base_atomic &) = delete;
+    void operator=(const base_atomic &) = delete;
+#else
     base_atomic(const base_atomic &) /* = delete */ ;
     void operator=(const base_atomic &) /* = delete */ ;
+#endif
     value_type v_;
 };
 
@@ -434 +443 @@
 
     BOOST_ATOMIC_DECLARE_POINTER_OPERATORS
 private:
-    base_atomic(const base_atomic  &) /* = delete */ ;
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+    base_atomic(const base_atomic &) = delete;
+    void operator=(const base_atomic &) = delete;
+#else
+    base_atomic(const base_atomic &) /* = delete */ ;
     void operator=(const base_atomic &) /* = delete */ ;
+#endif
     value_type v_;
 };
 
@@ -446 +460 @@
     typedef void * value_type;
     typedef lockpool::scoped_lock guard_type;
 public:
-    explicit base_atomic(value_type v) : v_(v) {}
-    base_atomic(void) {}
+    explicit BOOST_CONSTEXPR base_atomic(value_type v) BOOST_NOEXCEPT : v_(v) {}
+    BOOST_CONSTEXPR base_atomic(void) BOOST_NOEXCEPT {}
 
     void
     store(value_type v, memory_order /*order*/ = memory_order_seq_cst) volatile

boost/atomic/detail/gcc-x86.hpp

@@ -525 +525 @@
     typedef T value_type;
     typedef T difference_type;
 public:
-    explicit base_atomic(value_type v) : v_(v) {}
-    base_atomic(void) {}
+    explicit BOOST_CONSTEXPR base_atomic(value_type v) BOOST_NOEXCEPT : v_(v) {}
+    BOOST_CONSTEXPR base_atomic(void) BOOST_NOEXCEPT {}
 
     void
     store(value_type v, memory_order order = memory_order_seq_cst) volatile
@@ -651 +651 @@
 
     BOOST_ATOMIC_DECLARE_INTEGRAL_OPERATORS
 private:
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+    base_atomic(const base_atomic &) = delete;
+    void operator=(const base_atomic &) = delete;
+#else
     base_atomic(const base_atomic &) /* = delete */ ;
     void operator=(const base_atomic &) /* = delete */ ;
+#endif
     value_type v_;
 };
 

boost/atomic/atomic.hpp

@@ -88 +88 @@
     typedef T value_type;
     typedef atomics::detail::base_atomic<T, typename atomics::detail::classify<T>::type, atomics::detail::storage_size_of<T>::value, boost::is_signed<T>::value > super;
 public:
-    atomic(void) : super() {}
-    explicit atomic(const value_type & v) : super(v) {}
+    BOOST_CONSTEXPR atomic(void) BOOST_NOEXCEPT: super() {}
+    explicit BOOST_CONSTEXPR atomic(const value_type & v) BOOST_NOEXCEPT: super(v) {}
 
     atomic & operator=(value_type v) volatile
     {
         super::operator=(v);
         return *const_cast<atomic *>(this);
     }
+#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
+    atomic(const atomic &)  =delete;
+    atomic & operator=(const atomic &) =delete;
+#else
 private:
     atomic(const atomic &) /* =delete */ ;
     atomic & operator=(const atomic &) /* =delete */ ;
+#endif
 };
 
+
 typedef atomic<char> atomic_char;
 typedef atomic<unsigned char> atomic_uchar;
 typedef atomic<signed char> atomic_schar;