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

Test a user-defined error condition category; improve equivalent

Browse Source
This commit is contained in:
Peter Dimov
2017-05-21 01:25:09 +03:00
parent bdd1613898
commit 02262a4048
2 changed files with 108 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/system/error_code.hpp
+14 -5
View File
@@ -607,8 +607,20 @@ namespace boost
}
else if( condition.category() == std::generic_category() || condition.category() == boost::system::generic_category() )
{
return pc_->equivalent( code, boost::system::error_condition( condition.value(), boost::system::generic_category() ) );
boost::system::error_code bc( code, *pc_ );
boost::system::error_condition bn( condition.value(), boost::system::generic_category() );
return bc == bn;
}
#ifndef BOOST_NO_RTTI
else if( std_category const* pc2 = dynamic_cast< std_category const* >( &condition.category() ) )
{
boost::system::error_code bc( code, *pc_ );
boost::system::error_condition bn( condition.value(), *pc2->pc_ );
return bc == bn;
}
#endif
else
{
return false;
@@ -623,8 +635,7 @@ namespace boost
}
else if( *pc_ == boost::system::generic_category() )
{
std::error_category const & st = std::generic_category();
return st.equivalent( code, condition );
return code == std::error_condition( condition, std::generic_category() );
}
else
{
@@ -644,5 +655,3 @@ namespace boost
# endif
#endif // BOOST_SYSTEM_ERROR_CODE_HPP