From 647eb243ae9837e66e96d9a54ceb8afd72f30613 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 19 Apr 2018 16:14:27 +0300 Subject: [PATCH] core: CV_Error is marked as 'noreturn' --- modules/core/include/opencv2/core/base.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 786e9de698..9cdc6a32a2 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -454,6 +454,17 @@ for example: #define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ ) +//! @cond IGNORED +#ifdef __OPENCV_BUILD +#undef CV_Error +#define CV_Error CV_ErrorNoReturn +#undef CV_Error_ +#define CV_Error_ CV_ErrorNoReturn_ +#undef CV_Assert_1 +#define CV_Assert_1( expr ) if(!!(expr)) ; else cv::errorNoReturn( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ ) +#endif +//! @endcond + #endif // CV_STATIC_ANALYSIS #define CV_Assert_2( expr1, expr2 ) CV_Assert_1(expr1); CV_Assert_1(expr2)