Merge pull request #12744 from alalek:issue_12736

c716e374 · Alexander Alekhin · aeec6e43 · 0926a84a · c716e374
Commit c716e374 authored Oct 05, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

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