Skip to content

O
opencv
Commit 9b2b8404 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7553 from erichkeane:interlocked_add_fix

parents 8333ea41 ad6af6b9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
modules/core/include/opencv2/core/cvdef.h
View file @ 9b2b8404
...@@ -418,10 +418,7 @@ Cv64suf; ...@@ -418,10 +418,7 @@ Cv64suf;
* exchange-add operation for atomic operations on reference counters * * exchange-add operation for atomic operations on reference counters *
\****************************************************************************************/ \****************************************************************************************/
#if defined __INTEL_COMPILER && !(defined WIN32 || defined _WIN32) #if defined __GNUC__
// atomic increment on the linux version of the Intel(tm) compiler
# define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__
# if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__) # if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)
# ifdef __ATOMIC_ACQ_REL # ifdef __ATOMIC_ACQ_REL
# define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL) # define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
......
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