summaryrefslogtreecommitdiff
path: root/include/my_atomic_wrapper.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-03 16:55:14 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-03 16:55:14 +0300
commit1cda462f46305daf2a5becb1ed0ce4fcdf3ae404 (patch)
treea3c7fc47811ffc3171eeb3276a0e86235d05a261 /include/my_atomic_wrapper.h
parentc9cf6b13f6f9aaae57efb514e0b0f51e7ea09798 (diff)
parenta7dd7c899356b2d3a7f79e6ebba5d854ed63ae9d (diff)
downloadmariadb-git-1cda462f46305daf2a5becb1ed0ce4fcdf3ae404.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'include/my_atomic_wrapper.h')
-rw-r--r--include/my_atomic_wrapper.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_atomic_wrapper.h b/include/my_atomic_wrapper.h
index 61db886d53f..64835e30ca7 100644
--- a/include/my_atomic_wrapper.h
+++ b/include/my_atomic_wrapper.h
@@ -48,6 +48,8 @@ public:
{ return m.fetch_add(i, o); }
Type fetch_sub(const Type i, std::memory_order o= std::memory_order_relaxed)
{ return m.fetch_sub(i, o); }
+ Type fetch_xor(const Type i, std::memory_order o= std::memory_order_relaxed)
+ { return m.fetch_xor(i, o); }
bool compare_exchange_strong(Type& i1, const Type i2,
std::memory_order o1= std::memory_order_relaxed,
std::memory_order o2= std::memory_order_relaxed)