From 71009c9b4d3f8466cc9be564b20f1ba9cc9b3cd0 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 24 Oct 2018 14:45:45 +0300 Subject: [PATCH] core: fix merge from 3.4 `CV_ErrorNoReturn` should not be used in OpenCV --- modules/core/include/opencv2/core/base.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp index e84462ff1d..e5770553f7 100644 --- a/modules/core/include/opencv2/core/base.hpp +++ b/modules/core/include/opencv2/core/base.hpp @@ -390,8 +390,6 @@ CV_EXPORTS CV_NORETURN void error(int _code, const String& _err, const char* _fu #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