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

Do not map system::generic to std::generic directly

Browse Source
This commit is contained in:
Peter Dimov
2017-05-20 19:33:03 +03:00
parent c4238c745c
commit bdd1613898
2 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,22 +250,9 @@ namespace boost
operator std::error_category const & () const BOOST_SYSTEM_NOEXCEPT operator std::error_category const & () const BOOST_SYSTEM_NOEXCEPT
{ {
if( *this == generic_category() ) // do not map generic to std::generic on purpose; occasionally,
{ // there are two std::generic categories in a program, which leads
std::error_category const & st = std::generic_category(); // to error codes/conditions mysteriously not being equal to themselves
int ev = ENOENT;
// if the standard generic category works, use it; else not
if( st.equivalent( ev, st.default_error_condition( ev ) ) )
{
// g++ 4.x with libstdc++ 5 installed fails, because the two
// generic categories, v1 and v2, get mixed up
return st;
}
}
return std_cat_; return std_cat_;
} }
@ -618,7 +605,7 @@ namespace boost
{ {
return true; return true;
} }
else if( condition.category() == std::generic_category() ) 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() ) ); return pc_->equivalent( code, boost::system::error_condition( condition.value(), boost::system::generic_category() ) );
} }

20
test/std_interop_test.cpp
View File

@ -24,28 +24,14 @@ int main() {}
static void test_generic_category() static void test_generic_category()
{ {
int ev = ENOENT;
// check whether the standard generic category works
std::error_category const & st0 = std::generic_category();
bool has_roundtrip = st0.equivalent( ev, st0.default_error_condition( ev ) );
//
boost::system::error_category const & bt = boost::system::generic_category(); boost::system::error_category const & bt = boost::system::generic_category();
std::error_category const & st = bt; std::error_category const & st = bt;
BOOST_TEST_CSTR_EQ( bt.name(), st.name() ); BOOST_TEST_CSTR_EQ( bt.name(), st.name() );
if( has_roundtrip ) int ev = ENOENT;
{
BOOST_TEST_EQ( &st, &std::generic_category() ); BOOST_TEST_EQ( bt.message( ev ), st.message( ev ) );
}
else
{
BOOST_TEST_EQ( bt.message( ev ), st.message( ev ) );
}
{ {
boost::system::error_code bc( ev, bt ); boost::system::error_code bc( ev, bt );