Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/core/include/opencv2/core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ class CV_EXPORTS Exception : public std::exception
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
Expand Down
4 changes: 2 additions & 2 deletions modules/core/src/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion modules/videoio/src/cap_gphoto2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class GPhoto2Exception: public std::exception
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);
}
Expand Down