boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 04:27:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mkurdej-hotfix/deprecated-throw' into develop

Browse Source
This commit is contained in:
Beman
2017-05-28 09:19:32 -04:00
parent e84af437d8 b9eb153bac
commit c1d722543a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/system/system_error.hpp
View File

@ -44,10 +44,10 @@ namespace boost
const char * what_arg ) const char * what_arg )
: std::runtime_error(what_arg), m_error_code(ev,ecat) {} : std::runtime_error(what_arg), m_error_code(ev,ecat) {}
virtual ~system_error() throw() {} virtual ~system_error() BOOST_NOEXCEPT_OR_NOTHROW {}
const error_code & code() const throw() { return m_error_code; } const error_code & code() const BOOST_NOEXCEPT_OR_NOTHROW { return m_error_code; }
const char * what() const throw(); const char * what() const BOOST_NOEXCEPT_OR_NOTHROW;
private: private:
error_code m_error_code; error_code m_error_code;
@ -56,7 +56,7 @@ namespace boost
// implementation ------------------------------------------------------// // implementation ------------------------------------------------------//
inline const char * system_error::what() const throw() inline const char * system_error::what() const BOOST_NOEXCEPT_OR_NOTHROW
// see http://www.boost.org/more/error_handling.html for lazy build rationale // see http://www.boost.org/more/error_handling.html for lazy build rationale
{ {
if ( m_what.empty() ) if ( m_what.empty() )