Commit 80b1e67e authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1459 from tkoeppe/master

Add missing relaxed memory ordering.
parents f448dcde 08f9bf58
...@@ -153,7 +153,7 @@ namespace zmq ...@@ -153,7 +153,7 @@ namespace zmq
__ATOMIC_RELEASE, __ATOMIC_ACQUIRE); __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
return old; return old;
#elif defined ZMQ_ATOMIC_CXX11 #elif defined ZMQ_ATOMIC_CXX11
ptr.compare_exchange_strong(cmp_, val_); ptr.compare_exchange_strong(cmp_, val_, std::memory_order_acq_rel);
return cmp_; return cmp_;
#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H #elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
return (T*) atomic_cas_ptr (&ptr, cmp_, val_); return (T*) atomic_cas_ptr (&ptr, cmp_, val_);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment