diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-02 21:53:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-02 21:53:28 +0100 |
commit | b01698775b468a04e4d0a9bdd86035ff00e6decb (patch) | |
tree | 88f1784fe7833392caeaf713a7a616772f446b18 /src/core/internal_network | |
parent | Merge pull request #9708 from ameerj/gl-context-flush (diff) | |
download | yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.gz yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.bz2 yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.lz yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.xz yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.zst yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.zip |
Diffstat (limited to 'src/core/internal_network')
-rw-r--r-- | src/core/internal_network/network.cpp | 4 | ||||
-rw-r--r-- | src/core/internal_network/socket_proxy.cpp | 4 | ||||
-rw-r--r-- | src/core/internal_network/socket_proxy.h | 5 | ||||
-rw-r--r-- | src/core/internal_network/sockets.h | 9 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 7494fb62d..282ea1ff9 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -550,7 +550,7 @@ std::pair<s32, Errno> Socket::RecvFrom(int flags, std::vector<u8>& message, Sock return {-1, GetAndLogLastError()}; } -std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) { +std::pair<s32, Errno> Socket::Send(const std::vector<u8>& message, int flags) { ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); ASSERT(flags == 0); @@ -563,7 +563,7 @@ std::pair<s32, Errno> Socket::Send(std::span<const u8> message, int flags) { return {-1, GetAndLogLastError()}; } -std::pair<s32, Errno> Socket::SendTo(u32 flags, std::span<const u8> message, +std::pair<s32, Errno> Socket::SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index 7a77171c2..1e1c42cea 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -182,7 +182,7 @@ std::pair<s32, Errno> ProxySocket::ReceivePacket(int flags, std::vector<u8>& mes return {static_cast<u32>(read_bytes), Errno::SUCCESS}; } -std::pair<s32, Errno> ProxySocket::Send(std::span<const u8> message, int flags) { +std::pair<s32, Errno> ProxySocket::Send(const std::vector<u8>& message, int flags) { LOG_WARNING(Network, "(STUBBED) called"); ASSERT(message.size() < static_cast<size_t>(std::numeric_limits<int>::max())); ASSERT(flags == 0); @@ -200,7 +200,7 @@ void ProxySocket::SendPacket(ProxyPacket& packet) { } } -std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, std::span<const u8> message, +std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr) { ASSERT(flags == 0); diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index 9421492bc..f12b5f567 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/src/core/internal_network/socket_proxy.h @@ -4,7 +4,6 @@ #pragma once #include <mutex> -#include <span> #include <vector> #include <queue> @@ -49,11 +48,11 @@ public: std::pair<s32, Errno> ReceivePacket(int flags, std::vector<u8>& message, SockAddrIn* addr, std::size_t max_length); - std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override; + std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) override; void SendPacket(ProxyPacket& packet); - std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, + std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 4c7489258..2e328c645 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -5,7 +5,6 @@ #include <map> #include <memory> -#include <span> #include <utility> #if defined(_WIN32) @@ -67,9 +66,9 @@ public: virtual std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr) = 0; - virtual std::pair<s32, Errno> Send(std::span<const u8> message, int flags) = 0; + virtual std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) = 0; - virtual std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, + virtual std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr) = 0; virtual Errno SetLinger(bool enable, u32 linger) = 0; @@ -139,9 +138,9 @@ public: std::pair<s32, Errno> RecvFrom(int flags, std::vector<u8>& message, SockAddrIn* addr) override; - std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override; + std::pair<s32, Errno> Send(const std::vector<u8>& message, int flags) override; - std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, + std::pair<s32, Errno> SendTo(u32 flags, const std::vector<u8>& message, const SockAddrIn* addr) override; Errno SetLinger(bool enable, u32 linger) override; |