feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Revert addition of get_generic_std_category, get_system_std_category (they need this); do not use std::system_category on Cygwin

Browse Source
This commit is contained in:
Peter Dimov
2021-09-21 15:45:00 +03:00
parent 811564f186
commit ad66ea43a3
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,11 +102,11 @@ namespace boost
{ {
namespace system namespace system
{ {
namespace detail
{
inline std::error_category const & get_generic_std_category() inline error_category::operator std::error_category const & () const
{ {
if( id_ == detail::generic_category_id )
{
#if defined(BOOST_GCC) && BOOST_GCC < 50000 #if defined(BOOST_GCC) && BOOST_GCC < 50000
static const boost::system::detail::std_category generic_instance( this, 0x1F4D3 ); static const boost::system::detail::std_category generic_instance( this, 0x1F4D3 );
@ -117,11 +117,13 @@ inline std::error_category const & get_generic_std_category()
return std::generic_category(); return std::generic_category();
#endif #endif
} }
inline std::error_category const & get_system_std_category() if( id_ == detail::system_category_id )
{ {
#if 0 #if defined(__CYGWIN__)
// Under Cygwin, std::system_category() is POSIX
static const boost::system::detail::std_category system_instance( this, 0x1F4D7 ); static const boost::system::detail::std_category system_instance( this, 0x1F4D7 );
return system_instance; return system_instance;
@ -131,20 +133,6 @@ inline std::error_category const & get_system_std_category()
return std::system_category(); return std::system_category();
#endif #endif
}
} // namespace detail
inline error_category::operator std::error_category const & () const
{
if( id_ == detail::generic_category_id )
{
return detail::get_generic_std_category();
}
if( id_ == detail::system_category_id )
{
return detail::get_system_std_category();
} }
detail::std_category* p = ps_.load( std::memory_order_acquire ); detail::std_category* p = ps_.load( std::memory_order_acquire );