Commit 69560588 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #14953 from alalek:core_static_analysis_eval_expr

parents edf2cbd5 44836c7f
...@@ -326,8 +326,8 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch ...@@ -326,8 +326,8 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch
// In practice, some macro are not processed correctly (noreturn is not detected). // In practice, some macro are not processed correctly (noreturn is not detected).
// We need to use simplified definition for them. // We need to use simplified definition for them.
#define CV_Error(...) do { abort(); } while (0) #define CV_Error(code, msg) do { (void)(code); (void)(msg); abort(); } while (0)
#define CV_Error_( code, args ) do { cv::format args; abort(); } while (0) #define CV_Error_(code, args) do { (void)(code); (void)(cv::format args); abort(); } while (0)
#define CV_Assert( expr ) do { if (!(expr)) abort(); } while (0) #define CV_Assert( expr ) do { if (!(expr)) abort(); } while (0)
#define CV_ErrorNoReturn CV_Error #define CV_ErrorNoReturn CV_Error
#define CV_ErrorNoReturn_ CV_Error_ #define CV_ErrorNoReturn_ CV_Error_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment