yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #7773 from lioncash/udp-deprecated 

input_common/udp_client: Replace deprecated from_string()/to_ulong() functions
This commit is contained in:
Morph 2022-01-25 16:15:27 -05:00 committed by GitHub
parent 8dbad556ec 87eb3cb083
commit 306b3491c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input_common/drivers/udp_client.cpp
View File

@ -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; const std::size_t client = pad_index / PADS_PER_CLIENT;
return { return {
.guid = clients[client].uuid, .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 { Common::UUID UDPClient::GetHostUUID(const std::string& host) const {
const auto ip = boost::asio::ip::address_v4::from_string(host); const auto ip = boost::asio::ip::make_address_v4(host);
const auto hex_host = fmt::format("{:06x}", ip.to_ulong()); const auto hex_host = fmt::format("{:06x}", ip.to_uint());
return Common::UUID{hex_host}; return Common::UUID{hex_host};
} }

4
src/input_common/drivers/udp_client.h
View File

@ -145,8 +145,8 @@ private:
void OnPortInfo(Response::PortInfo); void OnPortInfo(Response::PortInfo);
void OnPadData(Response::PadData, std::size_t client); void OnPadData(Response::PadData, std::size_t client);
void StartCommunication(std::size_t client, const std::string& host, u16 port); void StartCommunication(std::size_t client, const std::string& host, u16 port);
const PadIdentifier GetPadIdentifier(std::size_t pad_index) const; PadIdentifier GetPadIdentifier(std::size_t pad_index) const;
const Common::UUID GetHostUUID(const std::string host) const; Common::UUID GetHostUUID(const std::string& host) const;
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const; Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;