diff options
| author | bunnei <bunneidev@gmail.com> | 2023-02-02 19:04:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 19:04:50 -0800 |
| commit | 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd (patch) | |
| tree | a86c945d2e8789250005ac38ebbb36c48e95b30c /src/core/internal_network/sockets.h | |
| parent | af20e25081f97d55b451606c87922e2b49f0d363 (diff) | |
| parent | b01698775b468a04e4d0a9bdd86035ff00e6decb (diff) | |
Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span
Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"
Diffstat (limited to 'src/core/internal_network/sockets.h')
| -rw-r--r-- | src/core/internal_network/sockets.h | 9 |
1 files changed, 4 insertions, 5 deletions
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; |