From 5e68531428dee7362091bba7d8287e7229206232 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 4 Jul 2022 09:54:07 +0200 Subject: [PATCH] event/SocketEvent: move ssize_t to class BufferedSocket --- src/event/BufferedSocket.hxx | 3 ++- src/event/SocketEvent.hxx | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/event/BufferedSocket.hxx b/src/event/BufferedSocket.hxx index 566f2fc01..d8851278b 100644 --- a/src/event/BufferedSocket.hxx +++ b/src/event/BufferedSocket.hxx @@ -26,6 +26,7 @@ #include #include #include +#include class EventLoop; @@ -39,7 +40,7 @@ protected: SocketEvent event; public: - using ssize_t = SocketEvent::ssize_t; + using ssize_t = std::make_signed::type; BufferedSocket(SocketDescriptor _fd, EventLoop &_loop) noexcept :event(_loop, BIND_THIS_METHOD(OnSocketReady), _fd) { diff --git a/src/event/SocketEvent.hxx b/src/event/SocketEvent.hxx index 69fc7252f..749eee808 100644 --- a/src/event/SocketEvent.hxx +++ b/src/event/SocketEvent.hxx @@ -25,9 +25,6 @@ #include "util/BindMethod.hxx" #include "util/IntrusiveList.hxx" -#include -#include - class EventLoop; /** @@ -75,8 +72,6 @@ public: */ static constexpr unsigned IMPLICIT_FLAGS = ERROR|HANGUP; - using ssize_t = std::make_signed::type; - SocketEvent(EventLoop &_loop, Callback _callback, SocketDescriptor _fd=SocketDescriptor::Undefined()) noexcept :loop(_loop),