From e3270dfd68b0c97b8ce94d826a6072860277ee16 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 18 Oct 2020 19:31:58 +0200 Subject: [PATCH] event/SocketEvent: use class IntrusiveList<> --- src/event/Loop.hxx | 5 +---- src/event/SocketEvent.hxx | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx index fc6efcdef..9f6f38308 100644 --- a/src/event/Loop.hxx +++ b/src/event/Loop.hxx @@ -91,10 +91,7 @@ class EventLoop final DeferredList deferred; #endif - using SocketList = - boost::intrusive::list>>, - boost::intrusive::constant_time_size>; + using SocketList = IntrusiveList; /** * A list of scheduled #SocketEvent instances, without those diff --git a/src/event/SocketEvent.hxx b/src/event/SocketEvent.hxx index 01a571410..0ccb7557a 100644 --- a/src/event/SocketEvent.hxx +++ b/src/event/SocketEvent.hxx @@ -23,8 +23,7 @@ #include "PollGroup.hxx" #include "net/SocketDescriptor.hxx" #include "util/BindMethod.hxx" - -#include +#include "util/IntrusiveList.hxx" #include #include @@ -45,8 +44,9 @@ class EventLoop; * thread that runs the #EventLoop, except where explicitly documented * as thread-safe. */ -class SocketEvent final : public boost::intrusive::list_base_hook> { +class SocketEvent final : IntrusiveListHook { friend class EventLoop; + friend class IntrusiveList; EventLoop &loop;