Merge pull request #1459 from tkoeppe/master

Add missing relaxed memory ordering.

Merge pull request #1459 from tkoeppe/master
Add missing relaxed memory ordering.
80b1e67e · Pieter Hintjens · f448dcde · 08f9bf58 · 80b1e67e
Commit 80b1e67e authored Jun 30, 2015 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

atomic_ptr.hpp src/atomic_ptr.hpp +1 -1

No files found.
--- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -153,7 +153,7 @@ namespace zmq
                    __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
            return old;
 #elif defined ZMQ_ATOMIC_CXX11
-            ptr.compare_exchange_strong(cmp_, val_);
+            ptr.compare_exchange_strong(cmp_, val_, std::memory_order_acq_rel);
            return cmp_;
 #elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
            return (T*) atomic_cas_ptr (&ptr, cmp_, val_);