From 446dee397c7f4e46b86632d5e74a1bf098d81c95 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 13 May 2025 16:02:43 +1000 Subject: [PATCH 1/2] chore: Update vcpkg submodule and builtin-baseline Signed-off-by: Zephyron --- externals/vcpkg | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/vcpkg b/externals/vcpkg index 1318ab14a..a974a0a20 160000 --- a/externals/vcpkg +++ b/externals/vcpkg @@ -1 +1 @@ -Subproject commit 1318ab14aae14db20085441cd71366891a9c9d0c +Subproject commit a974a0a2065457eff982554127637cade92c358e diff --git a/vcpkg.json b/vcpkg.json index de68f1b36..6b492d8aa 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "citron", - "builtin-baseline": "1318ab14aae14db20085441cd71366891a9c9d0c", + "builtin-baseline": "bc994510d2eb11aac7b43b03f67a7751d5bfe0e4", "version": "1.0", "dependencies": [ "boost-algorithm", From 25ac9bde7cb9788d36b6a6876821524afb7538de Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 13 May 2025 18:01:26 +1000 Subject: [PATCH 2/2] fix: Replace deprecated io_service with io_context in UDP client Updates UDP client code to use boost::asio::io_context instead of the deprecated boost::asio::io_service, fixing compilation errors with newer Boost versions. Signed-off-by: Zephyron --- src/input_common/drivers/udp_client.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 60821b31a..533f601fa 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: 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;