Merge branch 'develop' into feature/message_r

This commit is contained in:
Peter Dimov
2018-09-21 17:08:31 +03:00

View File

@@ -494,7 +494,7 @@ public:
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR) #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
operator std::error_condition () const BOOST_NOEXCEPT operator std::error_condition () const
{ {
return std::error_condition( value(), category() ); return std::error_condition( value(), category() );
} }
@@ -626,7 +626,7 @@ public:
#if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR) #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
operator std::error_code () const BOOST_NOEXCEPT operator std::error_code () const
{ {
return std::error_code( value(), category() ); return std::error_code( value(), category() );
} }