Merge 10.5 into 10.6

1 files changed, 3 insertions, 2 deletions

diff --git a/include/my_atomic_wrapper.h b/include/my_atomic_wrapper.h
index 50b68f42b3c..e45aba9d22b 100644
--- a/include/my_atomic_wrapper.h
+++ b/include/my_atomic_wrapper.h
@@ -43,9 +43,10 @@ public:
 
   Type load(std::memory_order o= std::memory_order_relaxed) const
   { return m.load(o); }
+  void store(Type i, std::memory_order o= std::memory_order_relaxed)
+  { m.store(i, o); }
   operator Type() const { return m.load(); }
-  Type operator=(const Type val)
-  { m.store(val, std::memory_order_relaxed); return val; }
+  Type operator=(const Type i) { store(i); return i; }
   Type operator=(const Atomic_relaxed<Type> &rhs) { return *this= Type{rhs}; }
   Type operator+=(const Type i) { return fetch_add(i); }
   Type fetch_add(const Type i, std::memory_order o= std::memory_order_relaxed)