From da0080dd1530e242d0e53f5cd74f3bb708788021 Mon Sep 17 00:00:00 2001 From: Alexander Shishkov Date: Fri, 27 Apr 2012 14:08:10 +0000 Subject: [PATCH] fixed #1855 --- modules/core/include/opencv2/core/operations.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index 9739e3ff5..1d8d42f93 100644 --- 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 /////// -#ifdef __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(reinterpret_cast(addr)), delta) #elif defined __GNUC__