Merge pull request #13553 from luctowers:master

b11566bf · Alexander Alekhin · ebe14fa4 · 9cc12ff0 · b11566bf
Commit b11566bf authored Jan 09, 2019 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -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