From 3f0765523113ae7fc1b300f27dd78c642bb2b6c7 Mon Sep 17 00:00:00 2001 From: Miroslav Kobetski Date: Mon, 30 Dec 2013 17:00:17 +0100 Subject: [PATCH] Fix for bug #3469 CV_XADD failing in clang+nvcc combination --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index fa3fbd681..405c12c24 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -444,7 +444,7 @@ CV_INLINE int cvIsInf( double value ) // atomic increment on the linux version of the Intel(tm) compiler # define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd(const_cast(reinterpret_cast(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_ACQ_REL # define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL) # else