From b7e12b6787b183da99de0f09a52b60cf954a6a65 Mon Sep 17 00:00:00 2001 From: Mungo Gill Date: Wed, 21 Jan 2026 11:50:43 +0000 Subject: [PATCH] fix compilation errors relating to the capy move of intrusive_list --- .../src/detail/epoll/resolver_service.hpp | 6 +++--- src/corosio/src/detail/epoll/sockets.hpp | 10 +++++----- .../src/detail/iocp/resolver_service.hpp | 6 +++--- src/corosio/src/detail/iocp/sockets.hpp | 18 +++++++++--------- src/corosio/src/detail/posix/signals.hpp | 6 +++--- src/corosio/src/detail/scheduler_op.hpp | 6 +++--- src/corosio/src/detail/timer_service.cpp | 8 ++++---- src/corosio/src/detail/win/signals.hpp | 7 +++---- src/corosio/src/test/mocket.cpp | 6 +++--- 9 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/corosio/src/detail/epoll/resolver_service.hpp b/src/corosio/src/detail/epoll/resolver_service.hpp index 0f09712..82bc51e 100644 --- a/src/corosio/src/detail/epoll/resolver_service.hpp +++ b/src/corosio/src/detail/epoll/resolver_service.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -44,7 +44,7 @@ class epoll_resolver_impl; */ class epoll_resolver_impl : public resolver::resolver_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class epoll_resolver_service; @@ -137,7 +137,7 @@ class epoll_resolver_service private: std::mutex mutex_; - capy::intrusive_list resolver_list_; + capy::detail::intrusive_list resolver_list_; }; //------------------------------------------------------------------------------ diff --git a/src/corosio/src/detail/epoll/sockets.hpp b/src/corosio/src/detail/epoll/sockets.hpp index 656af39..a9e5a9b 100644 --- a/src/corosio/src/detail/epoll/sockets.hpp +++ b/src/corosio/src/detail/epoll/sockets.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "src/detail/epoll/op.hpp" #include "src/detail/epoll/scheduler.hpp" @@ -105,7 +105,7 @@ class epoll_acceptor_impl; class epoll_socket_impl : public socket::socket_impl , public std::enable_shared_from_this - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class epoll_sockets; @@ -173,7 +173,7 @@ class epoll_socket_impl class epoll_acceptor_impl : public acceptor::acceptor_impl , public std::enable_shared_from_this - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class epoll_sockets; @@ -239,8 +239,8 @@ class epoll_sockets // Dual tracking: intrusive_list for fast shutdown iteration, // vectors for shared_ptr ownership. See "Impl Lifetime" in file header. - capy::intrusive_list socket_list_; - capy::intrusive_list acceptor_list_; + capy::detail::intrusive_list socket_list_; + capy::detail::intrusive_list acceptor_list_; std::vector> socket_ptrs_; std::vector> acceptor_ptrs_; }; diff --git a/src/corosio/src/detail/iocp/resolver_service.hpp b/src/corosio/src/detail/iocp/resolver_service.hpp index 141a258..e3c196b 100644 --- a/src/corosio/src/detail/iocp/resolver_service.hpp +++ b/src/corosio/src/detail/iocp/resolver_service.hpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "src/detail/iocp/windows.hpp" #include "src/detail/iocp/overlapped_op.hpp" @@ -82,7 +82,7 @@ struct resolve_op : overlapped_op */ class win_resolver_impl : public resolver::resolver_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class win_resolver_service; friend struct resolve_op; @@ -166,7 +166,7 @@ class win_resolver_service private: win_scheduler& sched_; win_mutex mutex_; - capy::intrusive_list resolver_list_; + capy::detail::intrusive_list resolver_list_; }; } // namespace detail diff --git a/src/corosio/src/detail/iocp/sockets.hpp b/src/corosio/src/detail/iocp/sockets.hpp index 714a696..76e00cb 100644 --- a/src/corosio/src/detail/iocp/sockets.hpp +++ b/src/corosio/src/detail/iocp/sockets.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "src/detail/iocp/windows.hpp" #include "src/detail/iocp/completion_key.hpp" @@ -119,7 +119,7 @@ struct accept_op : overlapped_op @note Internal implementation detail. Users interact with socket class. */ class win_socket_impl_internal - : public capy::intrusive_list::node + : public capy::detail::intrusive_list::node , public std::enable_shared_from_this { friend class win_sockets; @@ -181,7 +181,7 @@ class win_socket_impl_internal */ class win_socket_impl : public socket::socket_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { std::shared_ptr internal_; @@ -254,7 +254,7 @@ class win_socket_impl @note Internal implementation detail. Users interact with acceptor class. */ class win_acceptor_impl_internal - : public capy::intrusive_list::node + : public capy::detail::intrusive_list::node , public std::enable_shared_from_this { friend class win_sockets; @@ -296,7 +296,7 @@ class win_acceptor_impl_internal */ class win_acceptor_impl : public acceptor::acceptor_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { std::shared_ptr internal_; @@ -450,10 +450,10 @@ class win_sockets win_scheduler& sched_; overlapped_key overlapped_key_; win_mutex mutex_; - capy::intrusive_list socket_list_; - capy::intrusive_list acceptor_list_; - capy::intrusive_list socket_wrapper_list_; - capy::intrusive_list acceptor_wrapper_list_; + capy::detail::intrusive_list socket_list_; + capy::detail::intrusive_list acceptor_list_; + capy::detail::intrusive_list socket_wrapper_list_; + capy::detail::intrusive_list acceptor_wrapper_list_; void* iocp_; LPFN_CONNECTEX connect_ex_ = nullptr; LPFN_ACCEPTEX accept_ex_ = nullptr; diff --git a/src/corosio/src/detail/posix/signals.hpp b/src/corosio/src/detail/posix/signals.hpp index 3e60f7f..5e5594e 100644 --- a/src/corosio/src/detail/posix/signals.hpp +++ b/src/corosio/src/detail/posix/signals.hpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -83,7 +83,7 @@ struct signal_registration */ class posix_signal_impl : public signal_set::signal_set_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class posix_signals; @@ -214,7 +214,7 @@ class posix_signals : public capy::execution_context::service epoll_scheduler& sched_; std::mutex mutex_; - capy::intrusive_list impl_list_; + capy::detail::intrusive_list impl_list_; // Per-signal registration table signal_registration* registrations_[max_signal_number]; diff --git a/src/corosio/src/detail/scheduler_op.hpp b/src/corosio/src/detail/scheduler_op.hpp index 801a409..7e6747d 100644 --- a/src/corosio/src/detail/scheduler_op.hpp +++ b/src/corosio/src/detail/scheduler_op.hpp @@ -11,7 +11,7 @@ #define BOOST_COROSIO_DETAIL_SCHEDULER_OP_HPP #include -#include +#include namespace boost { namespace corosio { @@ -83,7 +83,7 @@ namespace detail { @see scheduler_op_queue */ -class scheduler_op : public capy::intrusive_queue::node +class scheduler_op : public capy::detail::intrusive_queue::node { public: virtual void operator()() = 0; @@ -113,7 +113,7 @@ class scheduler_op : public capy::intrusive_queue::node //------------------------------------------------------------------------------ -using op_queue = capy::intrusive_queue; +using op_queue = capy::detail::intrusive_queue; //------------------------------------------------------------------------------ diff --git a/src/corosio/src/detail/timer_service.cpp b/src/corosio/src/detail/timer_service.cpp index fd7af98..01b89d1 100644 --- a/src/corosio/src/detail/timer_service.cpp +++ b/src/corosio/src/detail/timer_service.cpp @@ -10,7 +10,7 @@ #include "src/detail/timer_service.hpp" #include -#include +#include #include #include #include @@ -31,7 +31,7 @@ class timer_service_impl; struct timer_impl : timer::timer_impl - , capy::intrusive_list::node + , capy::detail::intrusive_list::node { using clock_type = std::chrono::steady_clock; using time_point = clock_type::time_point; @@ -81,8 +81,8 @@ class timer_service_impl : public timer_service scheduler* sched_ = nullptr; mutable std::mutex mutex_; std::vector heap_; - capy::intrusive_list timers_; - capy::intrusive_list free_list_; + capy::detail::intrusive_list timers_; + capy::detail::intrusive_list free_list_; callback on_earliest_changed_; public: diff --git a/src/corosio/src/detail/win/signals.hpp b/src/corosio/src/detail/win/signals.hpp index e163982..15d34a3 100644 --- a/src/corosio/src/detail/win/signals.hpp +++ b/src/corosio/src/detail/win/signals.hpp @@ -19,8 +19,7 @@ #include #include #include -#include -#include +#include #include #include @@ -85,7 +84,7 @@ struct signal_registration */ class win_signal_impl : public signal_set::signal_set_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { friend class win_signals; @@ -218,7 +217,7 @@ class win_signals : public capy::execution_context::service win_scheduler& sched_; win_mutex mutex_; - capy::intrusive_list impl_list_; + capy::detail::intrusive_list impl_list_; // Per-signal registration table for this service signal_registration* registrations_[max_signal_number]; diff --git a/src/corosio/src/test/mocket.cpp b/src/corosio/src/test/mocket.cpp index 979db59..0553eb0 100644 --- a/src/corosio/src/test/mocket.cpp +++ b/src/corosio/src/test/mocket.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ class mocket_service; class mocket_impl : public io_stream::io_stream_impl - , public capy::intrusive_list::node + , public capy::detail::intrusive_list::node { mocket_service& svc_; capy::test::fuse& fuse_; @@ -122,7 +122,7 @@ class mocket_service : public capy::execution_context::service { capy::execution_context& ctx_; - capy::intrusive_list impls_; + capy::detail::intrusive_list impls_; public: explicit mocket_service(capy::execution_context& ctx)