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

Add second overload of equivalent, improve first

Browse Source
This commit is contained in:
Peter Dimov
2017-05-20 18:59:15 +03:00
parent 2d18f66800
commit c4238c745c
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/system/error_code.hpp
View File

@ -239,6 +239,7 @@ namespace boost
virtual std::error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT; virtual std::error_condition default_error_condition( int ev ) const BOOST_NOEXCEPT;
virtual bool equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT; virtual bool equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT;
virtual bool equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT;
}; };
std_category std_cat_; std_category std_cat_;
@ -613,13 +614,34 @@ namespace boost
inline bool error_category::std_category::equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT inline bool error_category::std_category::equivalent( int code, const std::error_condition & condition ) const BOOST_NOEXCEPT
{ {
if( condition.category() == std::generic_category() ) if( default_error_condition( code ) == condition )
{
return true;
}
else if( condition.category() == std::generic_category() )
{ {
return pc_->equivalent( code, boost::system::error_condition( condition.value(), boost::system::generic_category() ) ); return pc_->equivalent( code, boost::system::error_condition( condition.value(), boost::system::generic_category() ) );
} }
else else
{ {
return default_error_condition( code ) == condition; return false;
}
}
inline bool error_category::std_category::equivalent( const std::error_code & code, int condition ) const BOOST_NOEXCEPT
{
if( *this == code.category() && code.value() == condition )
{
return true;
}
else if( *pc_ == boost::system::generic_category() )
{
std::error_category const & st = std::generic_category();
return st.equivalent( code, condition );
}
else
{
return false;
} }
} }