summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-01-25 22:15:27 +0100
committerGitHub <noreply@github.com>2022-01-25 22:15:27 +0100
commit306b3491c4dcab8bcba732c8aa387b20583d8904 (patch)
treec2eddc0b01689567c9abfd11f11d997a4f8b482f
parentMerge pull request #7771 from lioncash/assert (diff)
parentinput_common/udp_client: Replace deprecated from_string()/to_ulong() functions (diff)
downloadyuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar.gz
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar.bz2
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar.lz
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar.xz
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.tar.zst
yuzu-306b3491c4dcab8bcba732c8aa387b20583d8904.zip
-rw-r--r--src/input_common/drivers/udp_client.cpp8
-rw-r--r--src/input_common/drivers/udp_client.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index 9aaeb91be..d1cdb1ab2 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -339,7 +339,7 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host,
}
}
-const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const {
+PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const {
const std::size_t client = pad_index / PADS_PER_CLIENT;
return {
.guid = clients[client].uuid,
@@ -348,9 +348,9 @@ const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const {
};
}
-const Common::UUID UDPClient::GetHostUUID(const std::string host) const {
- const auto ip = boost::asio::ip::address_v4::from_string(host);
- const auto hex_host = fmt::format("{:06x}", ip.to_ulong());
+Common::UUID UDPClient::GetHostUUID(const std::string& host) const {
+ const auto ip = boost::asio::ip::make_address_v4(host);
+ const auto hex_host = fmt::format("{:06x}", ip.to_uint());
return Common::UUID{hex_host};
}
diff --git a/src/input_common/drivers/udp_client.h b/src/input_common/drivers/udp_client.h
index 61a1fff37..30d7c2682 100644
--- a/src/input_common/drivers/udp_client.h
+++ b/src/input_common/drivers/udp_client.h
@@ -145,8 +145,8 @@ private:
void OnPortInfo(Response::PortInfo);
void OnPadData(Response::PadData, std::size_t client);
void StartCommunication(std::size_t client, const std::string& host, u16 port);
- const PadIdentifier GetPadIdentifier(std::size_t pad_index) const;
- const Common::UUID GetHostUUID(const std::string host) const;
+ PadIdentifier GetPadIdentifier(std::size_t pad_index) const;
+ Common::UUID GetHostUUID(const std::string& host) const;
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;