From 6e9cc9abd2b7bcd69f0f976a0c711558cc49d1dc Mon Sep 17 00:00:00 2001 From: Christopher Kohlhoff Date: Wed, 3 Apr 2024 07:51:27 +1100 Subject: [PATCH] Fix compile error when both experimental::channel and experimental::coro are used. --- asio/include/asio/experimental/detail/channel_service.hpp | 2 +- asio/include/asio/experimental/detail/impl/channel_service.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/asio/include/asio/experimental/detail/channel_service.hpp b/asio/include/asio/experimental/detail/channel_service.hpp index 38df2595d7..1232441461 100644 --- a/asio/include/asio/experimental/detail/channel_service.hpp +++ b/asio/include/asio/experimental/detail/channel_service.hpp @@ -83,7 +83,7 @@ class channel_service struct implementation_type; // Constructor. - channel_service(execution_context& ctx); + channel_service(asio::execution_context& ctx); // Destroy all user-defined handler objects owned by the service. void shutdown(); diff --git a/asio/include/asio/experimental/detail/impl/channel_service.hpp b/asio/include/asio/experimental/detail/impl/channel_service.hpp index c6a69a98f0..797c9f433c 100644 --- a/asio/include/asio/experimental/detail/impl/channel_service.hpp +++ b/asio/include/asio/experimental/detail/impl/channel_service.hpp @@ -22,7 +22,8 @@ namespace experimental { namespace detail { template -inline channel_service::channel_service(execution_context& ctx) +inline channel_service::channel_service( + asio::execution_context& ctx) : asio::detail::execution_context_service_base(ctx), mutex_(), impl_list_(0)