From 0812659e9234ed5865049317dacf5fe0dd811a35 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 29 Nov 2023 16:27:11 +0100 Subject: [PATCH] Fix compilation on some 32-bit windows I do not have more info on the platform as it is internal. Without this fix, the error is: core/src/arithm.simd.hpp:868:1: error: too few arguments provided to function-like macro invocation 868 | DEFINE_SIMD_ALL(cmp) | ^ ./third_party/OpenCV/public/modules/./core/src/arithm.simd.hpp:93:5: note: expanded from macro 'DEFINE_SIMD_ALL' 93 | DEFINE_SIMD_NSAT(fun, __VA_ARGS__) | ^ ./third_party/OpenCV/public/modules/./core/src/arithm.simd.hpp:89:5: note: expanded from macro 'DEFINE_SIMD_NSAT' 89 | DEFINE_SIMD_F64(fun, __VA_ARGS__) | ^ ./third_party/OpenCV/public/modules/./core/src/arithm.simd.hpp:77:9: note: expanded from macro 'DEFINE_SIMD_F64' 77 | DEFINE_NOSIMD(__CV_CAT(fun, 64f), double, __VA_ARGS__) | ^ ./third_party/OpenCV/public/modules/./core/src/arithm.simd.hpp:47:56: note: expanded from macro 'DEFINE_NOSIMD' 47 | DEFINE_NOSIMD_FUN(fun_name, c_type, __VA_ARGS__) | ^ ./third_party/OpenCV/public/modules/./core/src/arithm.simd.hpp:860:9: note: macro 'DEFINE_NOSIMD_FUN' defined here 860 | #define DEFINE_NOSIMD_FUN(fun, _T1, _Tvec, ...) \ --- modules/core/src/arithm.simd.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/arithm.simd.hpp b/modules/core/src/arithm.simd.hpp index 2c26680b51cf..3b8ab1c48b2c 100644 --- a/modules/core/src/arithm.simd.hpp +++ b/modules/core/src/arithm.simd.hpp @@ -865,7 +865,7 @@ static void cmp_loop_nosimd(const double* src1, size_t step1, const double* src2 } // todo: try to avoid define dispatcher functions using macros with these such cases -DEFINE_SIMD_ALL(cmp) +DEFINE_SIMD_ALL(cmp, void) //========================================================================= // scaling helpers for single and dual source