Merge pull request #7558 from alalek:cv_xadd

76f28fd4 · Alexander Alekhin · 9b2b8404 · 33a5778a · 76f28fd4
Commit 76f28fd4 authored 8 years ago by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cvdef.h modules/core/include/opencv2/core/cvdef.h +3 -1

No files found.
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -418,7 +418,9 @@ Cv64suf;
 *          exchange-add operation for atomic operations on reference counters            *
 \****************************************************************************************/

-#if defined __GNUC__
+#ifdef CV_XADD
+  // allow to use user-defined macro
+#elif defined __GNUC__
 #  if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)
 #    ifdef __ATOMIC_ACQ_REL
 #      define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)