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

Do not call generic_category() in system_error_category

Browse Source
This commit is contained in:
Peter Dimov
2021-06-12 21:59:22 +03:00
parent a21a3050a5
commit ff77d4c094
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/system/detail/system_category_impl.hpp
View File

@ -12,9 +12,7 @@
#include <boost/system/detail/system_category.hpp> #include <boost/system/detail/system_category.hpp>
#include <boost/system/detail/error_condition.hpp> #include <boost/system/detail/error_condition.hpp>
#include <boost/system/detail/generic_category.hpp>
#include <boost/system/api_config.hpp> #include <boost/system/api_config.hpp>
#include <boost/config.hpp>
#if !defined(BOOST_POSIX_API) && !defined(BOOST_WINDOWS_API) #if !defined(BOOST_POSIX_API) && !defined(BOOST_WINDOWS_API)
# error BOOST_POSIX_API or BOOST_WINDOWS_API must be defined # error BOOST_POSIX_API or BOOST_WINDOWS_API must be defined
@ -37,7 +35,7 @@ inline boost::system::error_condition boost::system::detail::system_error_catego
} }
else else
{ {
return error_condition( e2, generic_category() ); return error_condition( boost::system::detail::generic_value_tag( e2 ) );
} }
} }
@ -54,18 +52,10 @@ inline char const * boost::system::detail::system_error_category::message( int e
#else // #if defined(BOOST_WINDOWS_API) #else // #if defined(BOOST_WINDOWS_API)
#include <boost/system/detail/generic_category_message.hpp> #include <boost/system/detail/generic_category_message.hpp>
#include <boost/system/detail/is_generic_value.hpp>
inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const BOOST_NOEXCEPT inline boost::system::error_condition boost::system::detail::system_error_category::default_error_condition( int ev ) const BOOST_NOEXCEPT
{ {
if( is_generic_value( ev ) ) return error_condition( boost::system::detail::generic_value_tag( ev ) );
{
return error_condition( ev, generic_category() );
}
else
{
return error_condition( ev, *this );
}
} }
inline std::string boost::system::detail::system_error_category::message( int ev ) const inline std::string boost::system::detail::system_error_category::message( int ev ) const