generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

applied patch from #1637 for fixing problems with Intel(tm) compiler

Browse Source
This commit is contained in:
Alexander Shishkov 2012-03-02 12:24:03 +00:00
parent ab221fb3d6
commit f5b8af3254
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/include/opencv2/core/operations.hpp
View File

@ -52,7 +52,9 @@
#ifdef __cplusplus #ifdef __cplusplus
/////// exchange-add operation for atomic operations on reference counters /////// /////// exchange-add operation for atomic operations on reference counters ///////
#ifdef __GNUC__ #ifdef __INTEL_COMPILER // atomic increment on the Intel(tm) compiler
#define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__
#if __GNUC__*10 + __GNUC_MINOR__ >= 42 #if __GNUC__*10 + __GNUC_MINOR__ >= 42
@ -80,11 +82,10 @@
#undef max #undef max
#undef abs #undef abs
#define CV_XADD(addr,delta) InterlockedExchangeAdd((long volatile*)(addr), (delta)) #define CV_XADD(addr,delta) InterlockedExchangeAdd((long volatile*)(addr), (delta))
#else
#else
static inline int CV_XADD(int* addr, int delta) static inline int CV_XADD(int* addr, int delta)
{ int tmp = *addr; *addr += delta; return tmp; } { int tmp = *addr; *addr += delta; return tmp; }
#endif #endif
#include <limits> #include <limits>