Fix improper defining of CV_XADD when using Intel C++
authorLucas Towers <luctowers@gmail.com>
Mon, 31 Dec 2018 13:57:38 +0000 (05:57 -0800)
committerLucas Towers <luctowers@gmail.com>
Wed, 9 Jan 2019 11:41:21 +0000 (14:41 +0300)
modules/core/include/opencv2/core/cvdef.h

index 1e8a697..afc603a 100644 (file)
@@ -463,7 +463,7 @@ Cv64suf;
 #ifdef CV_XADD
   // allow to use user-defined macro
 #elif defined __GNUC__ || defined __clang__
-#  if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)
+#  if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)  && !defined __INTEL_COMPILER
 #    ifdef __ATOMIC_ACQ_REL
 #      define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
 #    else