projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1de10f9
)
Fix issue #8278: "CV_XADD compile errors with Embarcadero C++ Builder 10.1"
author
ville-v
<ville-v@users.noreply.github.com>
Wed, 1 Mar 2017 06:47:49 +0000
(08:47 +0200)
committer
GitHub
<noreply@github.com>
Wed, 1 Mar 2017 06:47:49 +0000
(08:47 +0200)
modules/core/include/opencv2/core/cvdef.h
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/cvdef.h
b/modules/core/include/opencv2/core/cvdef.h
index
3f55cc1
..
91ebd20
100644
(file)
--- a/
modules/core/include/opencv2/core/cvdef.h
+++ b/
modules/core/include/opencv2/core/cvdef.h
@@
-438,7
+438,7
@@
Cv64suf;
#ifdef CV_XADD
// allow to use user-defined macro
-#elif defined __GNUC__
+#elif defined __GNUC__
|| defined __clang__
# 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)