boost/asio
2
0
Fork 0
mirror of https://github.com/boostorg/asio.git synced 2026-01-26 18:22:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix detection of standard executors as I/O executors in async_compose.

Browse Source
This commit is contained in:
Christopher Kohlhoff
2020-07-27 09:33:49 +10:00
parent 55a6f4aefe
commit badd16b2ff
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/asio/impl/compose.hpp
View File

@@ -496,14 +496,20 @@ namespace detail
template <typename IoObject>
inline typename IoObject::executor_type
get_composed_io_executor(IoObject& io_object,
typename enable_if<!is_executor<IoObject>::value>::type* = 0)
typename enable_if<
!is_executor<IoObject>::value
&& !execution::is_executor<IoObject>::value
>::type* = 0)
{
return io_object.get_executor();
}
template <typename Executor>
inline const Executor& get_composed_io_executor(const Executor& ex,
typename enable_if<is_executor<Executor>::value>::type* = 0)
typename enable_if<
is_executor<Executor>::value
|| execution::is_executor<Executor>::value
>::type* = 0)
{
return ex;
}