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/network.cpp | |
| 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/network.cpp')
| -rw-r--r-- | src/core/internal_network/network.cpp | 4 |
1 files changed, 2 insertions, 2 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); |
