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:
37295d7
)
fixed #1855
author
Alexander Shishkov
<no@email>
Fri, 27 Apr 2012 14:08:10 +0000
(14:08 +0000)
committer
Alexander Shishkov
<no@email>
Fri, 27 Apr 2012 14:08:10 +0000
(14:08 +0000)
modules/core/include/opencv2/core/operations.hpp
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/operations.hpp
b/modules/core/include/opencv2/core/operations.hpp
index
9739e3f
..
1d8d42f
100644
(file)
--- a/
modules/core/include/opencv2/core/operations.hpp
+++ b/
modules/core/include/opencv2/core/operations.hpp
@@
-52,7
+52,7
@@
#ifdef __cplusplus
/////// exchange-add operation for atomic operations on reference counters ///////
-#if
def __INTEL_COMPILER // atomic increment on
the Intel(tm) compiler
+#if
defined __INTEL_COMPILER && !(defined WIN32 || defined _WIN32) // atomic increment on the linux version of
the Intel(tm) compiler
#define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__