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

throw() -> noexcept

Browse Source
This commit is contained in:
Richard Barnes 2024-07-15 10:48:02 -07:00
parent 7b176d898b
commit d1505693dd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core.hpp
View File

@ -123,12 +123,12 @@ public:
Instead, the macros CV_Error(), CV_Error_() and CV_Assert() are used.
*/
Exception(int _code, const String& _err, const String& _func, const String& _file, int _line);
virtual ~Exception() throw();
virtual ~Exception() CV_NOEXCEPT;
/*!
\return the error description and the context as a text string.
*/
virtual const char *what() const throw() CV_OVERRIDE;
virtual const char *what() const CV_NOEXCEPT CV_OVERRIDE;
void formatMessage();
String msg; ///< the formatted error message

4
modules/core/src/system.cpp
View File

@ -318,12 +318,12 @@ Exception::Exception(int _code, const String& _err, const String& _func, const S
formatMessage();
}
Exception::~Exception() throw() {}
Exception::~Exception() CV_NOEXCEPT {}
/*!
\return the error description and the context as a text string.
*/
const char* Exception::what() const throw() { return msg.c_str(); }
const char* Exception::what() const CV_NOEXCEPT { return msg.c_str(); }
void Exception::formatMessage()
{

2
modules/videoio/src/cap_gphoto2.cpp
View File

@ -65,7 +65,7 @@ public:
result = gPhoto2Result;
method = methodStr;
}
virtual const char * what() const throw() CV_OVERRIDE
virtual const char * what() const CV_NOEXCEPT CV_OVERRIDE
{
return gp_result_as_string(result);
}