From 0307b49f43bcd56f99ea6ee81c840c567750f409 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 30 Oct 2018 20:13:07 +0100 Subject: [PATCH] event/ServerSocket: make OnAccept() noexcept --- src/event/ServerSocket.hxx | 2 +- src/output/plugins/httpd/HttpdInternal.hxx | 2 +- src/output/plugins/httpd/HttpdOutputPlugin.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/event/ServerSocket.hxx b/src/event/ServerSocket.hxx index 8acdd7ae9..8390e1859 100644 --- a/src/event/ServerSocket.hxx +++ b/src/event/ServerSocket.hxx @@ -122,7 +122,7 @@ public: protected: virtual void OnAccept(UniqueSocketDescriptor fd, - SocketAddress address, int uid) = 0; + SocketAddress address, int uid) noexcept = 0; }; #endif diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx index 80d8928d6..d865142ed 100644 --- a/src/output/plugins/httpd/HttpdInternal.hxx +++ b/src/output/plugins/httpd/HttpdInternal.hxx @@ -261,7 +261,7 @@ private: void OnDeferredBroadcast() noexcept; void OnAccept(UniqueSocketDescriptor fd, - SocketAddress address, int uid) override; + SocketAddress address, int uid) noexcept override; }; extern const class Domain httpd_output_domain; diff --git a/src/output/plugins/httpd/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx index e3f6a2b03..a11e90c4b 100644 --- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx +++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx @@ -130,7 +130,7 @@ HttpdOutput::OnDeferredBroadcast() noexcept void HttpdOutput::OnAccept(UniqueSocketDescriptor fd, - SocketAddress address, gcc_unused int uid) + SocketAddress address, gcc_unused int uid) noexcept { /* the listener socket has become readable - a client has connected */