Merge pull request #787 from taka-no-me:quiet_nvcc

12 years ago · e8107610d1
parent 54511b4198 3107f79cea
commit e8107610d1
1 changed files with 2 additions and 2 deletions
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@ -443,9 +443,9 @@ CV_INLINE int cvIsInf( double value )
 #  else
 #    if defined __ATOMIC_ACQ_REL && !defined __clang__
       // version for gcc >= 4.7
-#      define CV_XADD(addr, delta) __atomic_fetch_add(addr, delta, __ATOMIC_ACQ_REL)
+#      define CV_XADD(addr, delta) (int)__atomic_fetch_add((unsigned*)(addr), (unsigned)(delta), __ATOMIC_ACQ_REL)
 #    else
-#      define CV_XADD(addr, delta) __sync_fetch_and_add(addr, delta)
+#      define CV_XADD(addr, delta) (int)__sync_fetch_and_add((unsigned*)(addr), (unsigned)(delta))
 #    endif
 #  endif
 #elif (defined WIN32 || defined _WIN32 || defined WINCE) && (!defined RC_INVOKED)