Commit 5ced3341 authored by Ivan Vilata-i-Balaguer's avatar Ivan Vilata-i-Balaguer
Browse files

Merge branch 'multi-peer-reader' into master.

Fix some issues with the Android build.
parents 14fb24a2 4145ed2a
......@@ -39,7 +39,7 @@ public:
~MultiPeerReader();
asio::executor get_executor()
asio::executor get_executor() override
{
return _executor;
}
......
......@@ -40,7 +40,7 @@ namespace detail {
sys::error_code ec;
async_write_c(p, s, tc, y[ec]);
if (tc && !c) ec = asio::error::timed_out;
assert(!c || ec = asio::error::operation_aborted);
assert(!c || ec == asio::error::operation_aborted);
return or_throw(y, ec);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment