From bf26050f7e980cd0d9770c844a7c68272856aa7d Mon Sep 17 00:00:00 2001 From: Zhuo Zhang Date: Mon, 26 Apr 2021 20:08:45 +0800 Subject: [PATCH] Fix missing return type for unsafe CV_XADD function --- modules/core/include/opencv2/core/cvdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h index 7d61e8714b..a4b560b4e1 100644 --- a/modules/core/include/opencv2/core/cvdef.h +++ b/modules/core/include/opencv2/core/cvdef.h @@ -554,7 +554,7 @@ Cv64suf; # define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd((long volatile*)addr, delta) #else #ifdef OPENCV_FORCE_UNSAFE_XADD - CV_INLINE CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; } + CV_INLINE int CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; } #else #error "OpenCV: can't define safe CV_XADD macro for current platform (unsupported). Define CV_XADD macro through custom port header (see OPENCV_INCLUDE_PORT_FILE)" #endif