diff options
| author | lizzie <lizzie@eden-emu.dev> | 2025-10-22 02:56:28 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-22 02:56:28 +0200 |
| commit | 992bae4e2a14ca2547c09637b7dc6fc5f73b353a (patch) | |
| tree | 4b7df7f2cf95255551ccfad40ea33ed354b1f8ec /src/core/internal_network | |
| parent | 6ff043c4fbd5dae5e0b1ec73a3bb4003e8cef20b (diff) | |
[common] replace Common::BitCast with libc++ provided one (#2774)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2774
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/core/internal_network')
| -rw-r--r-- | src/core/internal_network/network_interface.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/internal_network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 7be9434afe..8e8f099be8 100644 --- a/src/core/internal_network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp @@ -5,11 +5,12 @@ #include <fstream> #include <sstream> #include <vector> +#include <numeric> +#include <ranges> +#include <bit> -#include "common/bit_cast.h" #include "common/common_types.h" #include "common/logging/log.h" -#include <ranges> #include "common/settings.h" #include "common/string_util.h" #include "core/internal_network/emu_net_state.h" @@ -123,8 +124,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { // Just use 0 as the gateway address result.emplace_back(Network::NetworkInterface{ .name{ifa->ifa_name}, - .ip_address{Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr}, - .subnet_mask{Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr}, + .ip_address{std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr}, + .subnet_mask{std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr}, .gateway{in_addr{.s_addr = 0}} }); #else @@ -139,8 +140,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { gateway_0.s_addr = gateway; result.emplace_back(Network::NetworkInterface{ .name = ifa->ifa_name, - .ip_address = Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, - .subnet_mask = Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, + .ip_address = std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, + .subnet_mask = std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, .gateway = gateway_0 }); continue; @@ -191,8 +192,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { gateway_0.s_addr = gateway; result.emplace_back(Network::NetworkInterface{ .name = ifa->ifa_name, - .ip_address = Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, - .subnet_mask = Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, + .ip_address = std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, + .subnet_mask = std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, .gateway = gateway_0 }); #endif // ANDROID |