Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/cond.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ equivalent(
return ec == capy::error::not_found;

case cond::timeout:
return ec == capy::error::timeout;
if(ec == capy::error::timeout)
return true;
if(ec == std::errc::timed_out)
return true;
return false;

default:
return false;
Expand Down
12 changes: 12 additions & 0 deletions test/unit/cond.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@ class cond_test
BOOST_TEST(!(make_error_code(error::eof) == cond::stream_truncated));
BOOST_TEST(make_error_code(error::timeout) == cond::timeout);

// Equivalence: std::errc::timed_out == cond::timeout
{
auto ec = make_error_code(std::errc::timed_out);
BOOST_TEST(ec == cond::timeout);
BOOST_TEST(!(ec == cond::eof));
}
{
std::error_code ec = std::make_error_code(std::errc::timed_out);
BOOST_TEST(ec == cond::timeout);
BOOST_TEST(!(ec == cond::canceled));
}

// Out-of-range condition is equivalent to nothing.
{
auto ec = make_error_code(error::eof);
Expand Down
Loading