From d8a8169eb20935b777fbaf322fa2d43e8f29d005 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 27 Jun 2026 08:50:24 +0200 Subject: [hle/bsd] do not use rust-result wannabe Expected in functions (#4075) rust has Result but we don't really need that in c++, also the header just sucks, objectively Signed-off-by: lizzie lizzie@eden-emu.dev Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4075 Reviewed-by: CamilleLaVey Reviewed-by: crueter --- src/core/internal_network/network.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core/internal_network/network.cpp') diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index c95d7ca2da..077a2e042e 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -28,7 +28,6 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/expected.h" #include "common/logging.h" #include "common/settings.h" #include "core/internal_network/network.h" @@ -733,15 +732,14 @@ u32 IPv4AddressToInteger(IPv4Address ip_addr) { static_cast(ip_addr[2]) << 8 | static_cast(ip_addr[3]); } -Common::Expected, GetAddrInfoError> GetAddressInfo( +std::variant, GetAddrInfoError> GetAddressInfo( const std::string& host, const std::optional& service) { addrinfo hints{}; hints.ai_family = AF_INET; // Switch only supports IPv4. addrinfo* addrinfo; - s32 gai_err = getaddrinfo(host.c_str(), service.has_value() ? service->c_str() : nullptr, - &hints, &addrinfo); + s32 gai_err = getaddrinfo(host.c_str(), service.has_value() ? service->c_str() : nullptr, &hints, &addrinfo); if (gai_err != 0) { - return Common::Unexpected(TranslateGetAddrInfoErrorFromNative(gai_err)); + return TranslateGetAddrInfoErrorFromNative(gai_err); } std::vector ret; for (auto* current = addrinfo; current; current = current->ai_next) { -- cgit v1.2.3