eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 3 Projects Releases 2 Packages Wiki Activity Actions 2

Fix windows boost compilation errors

Browse source
This commit is contained in:
Briar 2025-04-02 02:23:54 +02:00
parent 2cdd8e07bd
commit a351ea0212
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/input_common/drivers/udp_client.cpp
View file

@ -26,8 +26,8 @@ public:
using clock = std::chrono::system_clock; using clock = std::chrono::system_clock;
explicit Socket(const std::string& host, u16 port, SocketCallback callback_) explicit Socket(const std::string& host, u16 port, SocketCallback callback_)
: callback(std::move(callback_)), timer(io_service), : callback(std::move(callback_)), timer(io_context),
socket(io_service, udp::endpoint(udp::v4(), 0)), client_id(GenerateRandomClientId()) { socket(io_context, udp::endpoint(udp::v4(), 0)), client_id(GenerateRandomClientId()) {
boost::system::error_code ec{}; boost::system::error_code ec{};
auto ipv4 = boost::asio::ip::make_address_v4(host, ec); auto ipv4 = boost::asio::ip::make_address_v4(host, ec);
if (ec.value() != boost::system::errc::success) { if (ec.value() != boost::system::errc::success) {
@ -39,11 +39,11 @@ public:
} }
void Stop() { void Stop() {
io_service.stop(); io_context.stop();
} }
void Loop() { void Loop() {
io_service.run(); io_context.run();
} }
void StartSend(const clock::time_point& from) { void StartSend(const clock::time_point& from) {
@ -113,10 +113,11 @@ private:
} }
SocketCallback callback; SocketCallback callback;
boost::asio::io_service io_service; boost::asio::io_context io_context;
boost::asio::basic_waitable_timer<clock> timer; boost::asio::basic_waitable_timer<clock> timer;
udp::socket socket; udp::socket socket;
const u32 client_id; const u32 client_id;
static constexpr std::size_t PORT_INFO_SIZE = sizeof(Message<Request::PortInfo>); static constexpr std::size_t PORT_INFO_SIZE = sizeof(Message<Request::PortInfo>);

5
src/tests/input_common/calibration_configuration_job.cpp
View file

@ -11,10 +11,11 @@
#include "input_common/drivers/udp_client.h" #include "input_common/drivers/udp_client.h"
#include "input_common/helpers/udp_protocol.h" #include "input_common/helpers/udp_protocol.h"
class FakeCemuhookServer { class FakeCemuhookServer {
public: public:
FakeCemuhookServer() 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() { ~FakeCemuhookServer() {
is_running = false; is_running = false;
@ -82,7 +83,7 @@ public:
} }
private: private:
boost::asio::io_service io_service; boost::asio::io_context io_context;
boost::asio::ip::udp::socket socket; boost::asio::ip::udp::socket socket;
std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> send_buffer; std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> send_buffer;
std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> receive_buffer; std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> receive_buffer;