core: fix merge from 3.4

`CV_ErrorNoReturn` should not be used in OpenCV

core: fix merge from 3.4
`CV_ErrorNoReturn` should not be used in OpenCV
71009c9b · Alexander Alekhin · dbed39a9 · 71009c9b
Commit 71009c9b authored Oct 24, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

base.hpp modules/core/include/opencv2/core/base.hpp +0 -2

No files found.
--- 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