From 44836c7f7806121218350cf91f7285e405008ad9 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 1 Jul 2019 18:17:03 +0300 Subject: [PATCH] core: evaluate CV_Error() parameters during static scans --- modules/core/include/opencv2/core/base.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 0179d18aec..546140e9f1 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -326,8 +326,8 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch // In practice, some macro are not processed correctly (noreturn is not detected). // We need to use simplified definition for them. -#define CV_Error(...) do { abort(); } while (0) -#define CV_Error_( code, args ) do { cv::format args; abort(); } while (0) +#define CV_Error(code, msg) do { (void)(code); (void)(msg); abort(); } while (0) +#define CV_Error_(code, args) do { (void)(code); (void)(cv::format args); abort(); } while (0) #define CV_Assert( expr ) do { if (!(expr)) abort(); } while (0) #define CV_ErrorNoReturn CV_Error #define CV_ErrorNoReturn_ CV_Error_