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

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

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-08 20:10:34 +04:00 committed by OpenCV Buildbot
commit e8107610d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/cvdef.h
View File

@ -443,9 +443,9 @@ CV_INLINE int cvIsInf( double value )
# else # else
# if defined __ATOMIC_ACQ_REL && !defined __clang__ # if defined __ATOMIC_ACQ_REL && !defined __clang__
// version for gcc >= 4.7 // 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 # 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
# endif # endif
#elif (defined WIN32 || defined _WIN32 || defined WINCE) && (!defined RC_INVOKED) #elif (defined WIN32 || defined _WIN32 || defined WINCE) && (!defined RC_INVOKED)