mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: eliminate Winvalid-noreturn in base.hpp

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-28 21:32:47 +00:00
parent aa11cc19e8
commit a49cda6523
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/include/opencv2/core/base.hpp
View File

@ -297,7 +297,10 @@ It is possible to alternate error processing by using redirectError().
*/ */
CV_EXPORTS void error(int _code, const String& _err, const char* _func, const char* _file, int _line); CV_EXPORTS void error(int _code, const String& _err, const char* _func, const char* _file, int _line);
#ifdef __GNUC__ #if defined(__clang__) && defined(_MSC_VER) // MSVC-Clang
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Winvalid-noreturn"
#elif defined(__GNUC__)
# if defined __clang__ || defined __APPLE__ # if defined __clang__ || defined __APPLE__
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Winvalid-noreturn" # pragma GCC diagnostic ignored "-Winvalid-noreturn"
@ -316,7 +319,10 @@ CV_INLINE CV_NORETURN void errorNoReturn(int _code, const String& _err, const ch
# endif # endif
#endif #endif
} }
#ifdef __GNUC__
#if defined(__clang__) && defined(_MSC_VER) // MSVC-Clang
# pragma clang diagnostic pop
#elif defined(__GNUC__)
# if defined __clang__ || defined __APPLE__ # if defined __clang__ || defined __APPLE__
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
# endif # endif