Fix for bug #3469 CV_XADD failing in clang+nvcc combination

Taken from 3f076552

Fix for bug #3469 CV_XADD failing in clang+nvcc combination
Taken from 3f076552
32f6e1a5 · bhack · 10bbcca1 · 32f6e1a5
Commit 32f6e1a5 authored Sep 23, 2014 by bhack
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

operations.hpp modules/core/include/opencv2/core/operations.hpp +1 -1

No files found.
--- a/modules/core/include/opencv2/core/operations.hpp
+++ b/modules/core/include/opencv2/core/operations.hpp
@@ -56,7 +56,7 @@
  #define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
 #elif defined __GNUC__

-  #if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__
+  #if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__  && !defined(__CUDACC__)
    #ifdef __ATOMIC_SEQ_CST
        #define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), (delta), __ATOMIC_SEQ_CST)
    #else