From: Alexander Alekhin Date: Thu, 4 Oct 2018 11:43:43 +0000 (+0300) Subject: cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~517^2~11^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0926a84a45031d4e024f1378f3a09f12a348c2ad;p=platform%2Fupstream%2Fopencv.git cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS to avoid build break without `__OPENCV_BUILD` --- diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index 389fa65..98683a2 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -415,6 +415,8 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch #define CV_Error(...) do { abort(); } while (0) #define CV_Error_( code, args ) do { 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_ #else // CV_STATIC_ANALYSIS