Skip to content

fix compilation errors relating to the capy move of intrusive_list #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MungoG wants to merge 1 commit into from
Closed

fix compilation errors relating to the capy move of intrusive_list #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/corosio/src/detail/epoll/resolver_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/concept/io_awaitable.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>

#include <mutex>
#include <stdexcept>
Expand All @@ -44,7 +44,7 @@ class epoll_resolver_impl;
*/
class epoll_resolver_impl
: public resolver::resolver_impl
, public capy::intrusive_list<epoll_resolver_impl>::node
, public capy::detail::intrusive_list<epoll_resolver_impl>::node
{
friend class epoll_resolver_service;

Expand Down Expand Up @@ -137,7 +137,7 @@ class epoll_resolver_service

private:
std::mutex mutex_;
capy::intrusive_list<epoll_resolver_impl> resolver_list_;
capy::detail::intrusive_list<epoll_resolver_impl> resolver_list_;
};

//------------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions src/corosio/src/detail/epoll/sockets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/concept/io_awaitable.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>

#include "src/detail/epoll/op.hpp"
#include "src/detail/epoll/scheduler.hpp"
Expand Down Expand Up @@ -105,7 +105,7 @@ class epoll_acceptor_impl;
class epoll_socket_impl
: public socket::socket_impl
, public std::enable_shared_from_this<epoll_socket_impl>
, public capy::intrusive_list<epoll_socket_impl>::node
, public capy::detail::intrusive_list<epoll_socket_impl>::node
{
friend class epoll_sockets;

Expand Down Expand Up @@ -173,7 +173,7 @@ class epoll_socket_impl
class epoll_acceptor_impl
: public acceptor::acceptor_impl
, public std::enable_shared_from_this<epoll_acceptor_impl>
, public capy::intrusive_list<epoll_acceptor_impl>::node
, public capy::detail::intrusive_list<epoll_acceptor_impl>::node
{
friend class epoll_sockets;

Expand Down Expand Up @@ -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<epoll_socket_impl> socket_list_;
capy::intrusive_list<epoll_acceptor_impl> acceptor_list_;
capy::detail::intrusive_list<epoll_socket_impl> socket_list_;
capy::detail::intrusive_list<epoll_acceptor_impl> acceptor_list_;
std::vector<std::shared_ptr<epoll_socket_impl>> socket_ptrs_;
std::vector<std::shared_ptr<epoll_acceptor_impl>> acceptor_ptrs_;
};
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/iocp/resolver_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/concept/io_awaitable.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>

#include "src/detail/iocp/windows.hpp"
#include "src/detail/iocp/overlapped_op.hpp"
Expand Down Expand Up @@ -82,7 +82,7 @@ struct resolve_op : overlapped_op
*/
class win_resolver_impl
: public resolver::resolver_impl
, public capy::intrusive_list<win_resolver_impl>::node
, public capy::detail::intrusive_list<win_resolver_impl>::node
{
friend class win_resolver_service;
friend struct resolve_op;
Expand Down Expand Up @@ -166,7 +166,7 @@ class win_resolver_service
private:
win_scheduler& sched_;
win_mutex mutex_;
capy::intrusive_list<win_resolver_impl> resolver_list_;
capy::detail::intrusive_list<win_resolver_impl> resolver_list_;
};

} // namespace detail
Expand Down
18 changes: 9 additions & 9 deletions src/corosio/src/detail/iocp/sockets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/concept/io_awaitable.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>

#include "src/detail/iocp/windows.hpp"
#include "src/detail/iocp/completion_key.hpp"
Expand Down Expand Up @@ -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<win_socket_impl_internal>::node
: public capy::detail::intrusive_list<win_socket_impl_internal>::node
, public std::enable_shared_from_this<win_socket_impl_internal>
{
friend class win_sockets;
Expand Down Expand Up @@ -181,7 +181,7 @@ class win_socket_impl_internal
*/
class win_socket_impl
: public socket::socket_impl
, public capy::intrusive_list<win_socket_impl>::node
, public capy::detail::intrusive_list<win_socket_impl>::node
{
std::shared_ptr<win_socket_impl_internal> internal_;

Expand Down Expand Up @@ -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<win_acceptor_impl_internal>::node
: public capy::detail::intrusive_list<win_acceptor_impl_internal>::node
, public std::enable_shared_from_this<win_acceptor_impl_internal>
{
friend class win_sockets;
Expand Down Expand Up @@ -296,7 +296,7 @@ class win_acceptor_impl_internal
*/
class win_acceptor_impl
: public acceptor::acceptor_impl
, public capy::intrusive_list<win_acceptor_impl>::node
, public capy::detail::intrusive_list<win_acceptor_impl>::node
{
std::shared_ptr<win_acceptor_impl_internal> internal_;

Expand Down Expand Up @@ -450,10 +450,10 @@ class win_sockets
win_scheduler& sched_;
overlapped_key overlapped_key_;
win_mutex mutex_;
capy::intrusive_list<win_socket_impl_internal> socket_list_;
capy::intrusive_list<win_acceptor_impl_internal> acceptor_list_;
capy::intrusive_list<win_socket_impl> socket_wrapper_list_;
capy::intrusive_list<win_acceptor_impl> acceptor_wrapper_list_;
capy::detail::intrusive_list<win_socket_impl_internal> socket_list_;
capy::detail::intrusive_list<win_acceptor_impl_internal> acceptor_list_;
capy::detail::intrusive_list<win_socket_impl> socket_wrapper_list_;
capy::detail::intrusive_list<win_acceptor_impl> acceptor_wrapper_list_;
void* iocp_;
LPFN_CONNECTEX connect_ex_ = nullptr;
LPFN_ACCEPTEX accept_ex_ = nullptr;
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/posix/signals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <boost/capy/ex/any_coro.hpp>
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>
#include <boost/system/error_code.hpp>
#include <boost/system/result.hpp>

Expand Down Expand Up @@ -83,7 +83,7 @@ struct signal_registration
*/
class posix_signal_impl
: public signal_set::signal_set_impl
, public capy::intrusive_list<posix_signal_impl>::node
, public capy::detail::intrusive_list<posix_signal_impl>::node
{
friend class posix_signals;

Expand Down Expand Up @@ -214,7 +214,7 @@ class posix_signals : public capy::execution_context::service

epoll_scheduler& sched_;
std::mutex mutex_;
capy::intrusive_list<posix_signal_impl> impl_list_;
capy::detail::intrusive_list<posix_signal_impl> impl_list_;

// Per-signal registration table
signal_registration* registrations_[max_signal_number];
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/detail/scheduler_op.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define BOOST_COROSIO_DETAIL_SCHEDULER_OP_HPP

#include <boost/corosio/detail/config.hpp>
#include <boost/capy/core/intrusive_queue.hpp>
#include <boost/capy/detail/intrusive.hpp>

namespace boost {
namespace corosio {
Expand Down Expand Up @@ -83,7 +83,7 @@ namespace detail {

@see scheduler_op_queue
*/
class scheduler_op : public capy::intrusive_queue<scheduler_op>::node
class scheduler_op : public capy::detail::intrusive_queue<scheduler_op>::node
{
public:
virtual void operator()() = 0;
Expand Down Expand Up @@ -113,7 +113,7 @@ class scheduler_op : public capy::intrusive_queue<scheduler_op>::node

//------------------------------------------------------------------------------

using op_queue = capy::intrusive_queue<scheduler_op>;
using op_queue = capy::detail::intrusive_queue<scheduler_op>;

//------------------------------------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions src/corosio/src/detail/timer_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "src/detail/timer_service.hpp"

#include <boost/corosio/detail/scheduler.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>
#include <boost/capy/error.hpp>
#include <boost/capy/ex/any_coro.hpp>
#include <boost/capy/ex/any_executor_ref.hpp>
Expand All @@ -31,7 +31,7 @@ class timer_service_impl;

struct timer_impl
: timer::timer_impl
, capy::intrusive_list<timer_impl>::node
, capy::detail::intrusive_list<timer_impl>::node
{
using clock_type = std::chrono::steady_clock;
using time_point = clock_type::time_point;
Expand Down Expand Up @@ -81,8 +81,8 @@ class timer_service_impl : public timer_service
scheduler* sched_ = nullptr;
mutable std::mutex mutex_;
std::vector<heap_entry> heap_;
capy::intrusive_list<timer_impl> timers_;
capy::intrusive_list<timer_impl> free_list_;
capy::detail::intrusive_list<timer_impl> timers_;
capy::detail::intrusive_list<timer_impl> free_list_;
callback on_earliest_changed_;

public:
Expand Down
7 changes: 3 additions & 4 deletions src/corosio/src/detail/win/signals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
#include <boost/capy/ex/any_executor_ref.hpp>
#include <boost/capy/concept/io_awaitable.hpp>
#include <boost/capy/ex/execution_context.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/core/intrusive_queue.hpp>
#include <boost/capy/detail/intrusive.hpp>
#include <boost/system/error_code.hpp>
#include <boost/system/result.hpp>

Expand Down Expand Up @@ -85,7 +84,7 @@ struct signal_registration
*/
class win_signal_impl
: public signal_set::signal_set_impl
, public capy::intrusive_list<win_signal_impl>::node
, public capy::detail::intrusive_list<win_signal_impl>::node
{
friend class win_signals;

Expand Down Expand Up @@ -218,7 +217,7 @@ class win_signals : public capy::execution_context::service

win_scheduler& sched_;
win_mutex mutex_;
capy::intrusive_list<win_signal_impl> impl_list_;
capy::detail::intrusive_list<win_signal_impl> impl_list_;

// Per-signal registration table for this service
signal_registration* registrations_[max_signal_number];
Expand Down
6 changes: 3 additions & 3 deletions src/corosio/src/test/mocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <boost/corosio/acceptor.hpp>
#include <boost/corosio/io_context.hpp>
#include <boost/corosio/socket.hpp>
#include <boost/capy/core/intrusive_list.hpp>
#include <boost/capy/detail/intrusive.hpp>
#include <boost/capy/error.hpp>
#include <boost/capy/ex/run_async.hpp>
#include <boost/capy/ex/execution_context.hpp>
Expand Down Expand Up @@ -41,7 +41,7 @@ class mocket_service;

class mocket_impl
: public io_stream::io_stream_impl
, public capy::intrusive_list<mocket_impl>::node
, public capy::detail::intrusive_list<mocket_impl>::node
{
mocket_service& svc_;
capy::test::fuse& fuse_;
Expand Down Expand Up @@ -122,7 +122,7 @@ class mocket_service
: public capy::execution_context::service
{
capy::execution_context& ctx_;
capy::intrusive_list<mocket_impl> impls_;
capy::detail::intrusive_list<mocket_impl> impls_;

public:
explicit mocket_service(capy::execution_context& ctx)
Expand Down
Loading