Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jenny Ryan
ouinet
Commits
5ced3341
Commit
5ced3341
authored
Dec 08, 2020
by
Ivan Vilata-i-Balaguer
Browse files
Merge branch 'multi-peer-reader' into master.
Fix some issues with the Android build.
parents
14fb24a2
4145ed2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cache/multi_peer_reader.h
View file @
5ced3341
...
...
@@ -39,7 +39,7 @@ public:
~
MultiPeerReader
();
asio
::
executor
get_executor
()
asio
::
executor
get_executor
()
override
{
return
_executor
;
}
...
...
src/response_part.h
View file @
5ced3341
...
...
@@ -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
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment