boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-08-01 21:34:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid instantiating the system category in error_code::operator std::error_code

Browse Source
This commit is contained in:
Peter Dimov
2021-09-24 15:24:45 +03:00
parent 4c201d26b2
commit 85c7d92302
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/system/detail/error_category_impl.hpp
View File

@@ -107,6 +107,7 @@ inline error_category::operator std::error_category const & () const
{
if( id_ == detail::generic_category_id )
{
// This condition must be the same as the one in error_condition.hpp
#if defined(BOOST_GCC) && BOOST_GCC < 50000
static const boost::system::detail::std_category generic_instance( this, 0x1F4D3 );
@@ -121,6 +122,7 @@ inline error_category::operator std::error_category const & () const
if( id_ == detail::system_category_id )
{
// This condition must be the same as the one in error_code.hpp
#if defined(__CYGWIN__) || defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER == 1800) || (defined(BOOST_GCC) && BOOST_GCC < 50000)
// Under Cygwin (and MinGW!), std::system_category() is POSIX

10
include/boost/system/detail/error_code.hpp
View File

@@ -504,8 +504,16 @@ public:
}
else if( lc_flags_ == 0 )
{
//return std::error_code();
// This condition must be the same as the one in error_category_impl.hpp
#if defined(__CYGWIN__) || defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER == 1800) || (defined(BOOST_GCC) && BOOST_GCC < 50000)
return std::error_code( 0, boost::system::system_category() );
#else
return std::error_code();
#endif
}
else
{