Skip to content

Commit 80d2a9c

Browse files
sgerbinomvandeberg
authored andcommitted
Fix compilation errors from upstream capy io_result API change
1 parent 07fab88 commit 80d2a9c

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

include/boost/corosio/io/io_signal_set.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class BOOST_COROSIO_DECL io_signal_set : public io_object
5454
capy::io_result<int> await_resume() const noexcept
5555
{
5656
if (token_.stop_requested())
57-
return {capy::error::canceled};
57+
return {capy::error::canceled, 0};
5858
return {ec_, signal_number_};
5959
}
6060

include/boost/corosio/native/native_signal_set.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class native_signal_set : public signal_set
7777
capy::io_result<int> await_resume() const noexcept
7878
{
7979
if (token_.stop_requested())
80-
return {capy::error::canceled};
80+
return {capy::error::canceled, 0};
8181
return {ec_, signal_number_};
8282
}
8383

test/unit/io_context.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,16 +543,19 @@ struct io_context_test
543543
}
544544
}
545545

546-
static capy::task<void> set_event_task(capy::async_event& evt)
546+
static capy::task<capy::io_result<>> set_event_task(capy::async_event& evt)
547547
{
548548
evt.set();
549-
co_return;
549+
co_return capy::io_result<>{{}};
550550
}
551551

552552
static capy::task<void> when_all_set_event_main(bool& finished)
553553
{
554554
capy::async_event evt;
555-
co_await capy::when_all(evt.wait(), set_event_task(evt));
555+
auto [ec, a, b] = co_await capy::when_all(evt.wait(), set_event_task(evt));
556+
(void)a;
557+
(void)b;
558+
BOOST_TEST(!ec);
556559
finished = true;
557560
}
558561

0 commit comments

Comments
 (0)