From 1044024e26652c1344c81c805562fffe7c43a78a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 23 Apr 2024 00:15:13 +1000 Subject: [PATCH] Add more override qualifiers for Windows. --- 3rdparty/asio/include/asio/detail/null_reactor.hpp | 6 +++--- 3rdparty/asio/include/asio/detail/select_reactor.hpp | 4 ++-- 3rdparty/asio/include/asio/detail/win_iocp_file_service.hpp | 2 +- .../asio/include/asio/detail/win_iocp_handle_service.hpp | 2 +- 3rdparty/asio/include/asio/detail/win_iocp_io_context.hpp | 2 +- .../include/asio/detail/win_iocp_serial_port_service.hpp | 2 +- .../asio/include/asio/detail/win_iocp_socket_service.hpp | 2 +- .../asio/include/asio/detail/win_object_handle_service.hpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdparty/asio/include/asio/detail/null_reactor.hpp b/3rdparty/asio/include/asio/detail/null_reactor.hpp index 128f2b4532968..147dc85cb7196 100644 --- a/3rdparty/asio/include/asio/detail/null_reactor.hpp +++ b/3rdparty/asio/include/asio/detail/null_reactor.hpp @@ -56,17 +56,17 @@ class null_reactor } // Destroy all user-defined handler objects owned by the service. - void shutdown() + void shutdown() override { } // No-op because should never be called. - void run(long /*usec*/, op_queue& /*ops*/) + void run(long /*usec*/, op_queue& /*ops*/) override { } // No-op. - void interrupt() + void interrupt() override { } }; diff --git a/3rdparty/asio/include/asio/detail/select_reactor.hpp b/3rdparty/asio/include/asio/detail/select_reactor.hpp index 7fe647b7e6308..a45d85d203e66 100644 --- a/3rdparty/asio/include/asio/detail/select_reactor.hpp +++ b/3rdparty/asio/include/asio/detail/select_reactor.hpp @@ -74,11 +74,11 @@ class select_reactor ASIO_DECL ~select_reactor(); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Recreate internal descriptors following a fork. ASIO_DECL void notify_fork( - asio::execution_context::fork_event fork_ev); + asio::execution_context::fork_event fork_ev) override; // Initialise the task, but only if the reactor is not in its own thread. ASIO_DECL void init_task(); diff --git a/3rdparty/asio/include/asio/detail/win_iocp_file_service.hpp b/3rdparty/asio/include/asio/detail/win_iocp_file_service.hpp index f10a8d3cdf4f0..898455f636cf9 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_file_service.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_file_service.hpp @@ -54,7 +54,7 @@ class win_iocp_file_service : ASIO_DECL win_iocp_file_service(execution_context& context); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Construct a new file implementation. void construct(implementation_type& impl) diff --git a/3rdparty/asio/include/asio/detail/win_iocp_handle_service.hpp b/3rdparty/asio/include/asio/detail/win_iocp_handle_service.hpp index 9e2486b4b79d3..ea30ffa88161a 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_handle_service.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_handle_service.hpp @@ -79,7 +79,7 @@ class win_iocp_handle_service : ASIO_DECL win_iocp_handle_service(execution_context& context); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Construct a new handle implementation. ASIO_DECL void construct(implementation_type& impl); diff --git a/3rdparty/asio/include/asio/detail/win_iocp_io_context.hpp b/3rdparty/asio/include/asio/detail/win_iocp_io_context.hpp index 1de94df78545d..bd5156a5d796a 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_io_context.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_io_context.hpp @@ -54,7 +54,7 @@ class win_iocp_io_context ASIO_DECL ~win_iocp_io_context(); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Initialise the task. Nothing to do here. void init_task() diff --git a/3rdparty/asio/include/asio/detail/win_iocp_serial_port_service.hpp b/3rdparty/asio/include/asio/detail/win_iocp_serial_port_service.hpp index e0e12e91d5fbb..b18fe184ec0f2 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_serial_port_service.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_serial_port_service.hpp @@ -45,7 +45,7 @@ class win_iocp_serial_port_service : ASIO_DECL win_iocp_serial_port_service(execution_context& context); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Construct a new serial port implementation. void construct(implementation_type& impl) diff --git a/3rdparty/asio/include/asio/detail/win_iocp_socket_service.hpp b/3rdparty/asio/include/asio/detail/win_iocp_socket_service.hpp index faeaffa4c36cc..dc77f08ff768e 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_socket_service.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_socket_service.hpp @@ -136,7 +136,7 @@ class win_iocp_socket_service : } // Destroy all user-defined handler objects owned by the service. - void shutdown() + void shutdown() override { this->base_shutdown(); } diff --git a/3rdparty/asio/include/asio/detail/win_object_handle_service.hpp b/3rdparty/asio/include/asio/detail/win_object_handle_service.hpp index 8e01b72f4f67c..1cf6f47fb8323 100644 --- a/3rdparty/asio/include/asio/detail/win_object_handle_service.hpp +++ b/3rdparty/asio/include/asio/detail/win_object_handle_service.hpp @@ -87,7 +87,7 @@ class win_object_handle_service : ASIO_DECL win_object_handle_service(execution_context& context); // Destroy all user-defined handler objects owned by the service. - ASIO_DECL void shutdown(); + ASIO_DECL void shutdown() override; // Construct a new handle implementation. ASIO_DECL void construct(implementation_type& impl);