From 21ca0b31191c4af56a78576c502e8382b4c128b4 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 27 Apr 2025 13:57:27 +1000 Subject: [PATCH] fix: update deprecated boost::asio::io_service to io_context Updates UDP client and related test files to use boost::asio::io_context instead of the deprecated io_service. This change is required for compatibility with newer versions of Boost ASIO, which has renamed the class. Signed-off-by: Zephyron --- src/input_common/drivers/udp_client.cpp | 11 ++++++----- .../input_common/calibration_configuration_job.cpp | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 553fee1aa..d7d95bb7a 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: 2018 Citra Emulator Project +// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include @@ -26,8 +27,8 @@ public: using clock = std::chrono::system_clock; explicit Socket(const std::string& host, u16 port, SocketCallback callback_) - : callback(std::move(callback_)), timer(io_service), - socket(io_service, udp::endpoint(udp::v4(), 0)), client_id(GenerateRandomClientId()) { + : callback(std::move(callback_)), timer(io_context), + socket(io_context, udp::endpoint(udp::v4(), 0)), client_id(GenerateRandomClientId()) { boost::system::error_code ec{}; auto ipv4 = boost::asio::ip::make_address_v4(host, ec); if (ec.value() != boost::system::errc::success) { @@ -39,11 +40,11 @@ public: } void Stop() { - io_service.stop(); + io_context.stop(); } void Loop() { - io_service.run(); + io_context.run(); } void StartSend(const clock::time_point& from) { @@ -113,7 +114,7 @@ private: } SocketCallback callback; - boost::asio::io_service io_service; + boost::asio::io_context io_context; boost::asio::basic_waitable_timer timer; udp::socket socket; diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cpp index 516ff1b30..8990df1ee 100644 --- a/src/tests/input_common/calibration_configuration_job.cpp +++ b/src/tests/input_common/calibration_configuration_job.cpp @@ -1,4 +1,5 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include @@ -14,7 +15,7 @@ class FakeCemuhookServer { public: FakeCemuhookServer() - : socket(io_service, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0)) {} + : socket(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0)) {} ~FakeCemuhookServer() { is_running = false; @@ -82,7 +83,7 @@ public: } private: - boost::asio::io_service io_service; + boost::asio::io_context io_context; boost::asio::ip::udp::socket socket; std::array send_buffer; std::array receive_buffer;