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/common/string_util.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/common/string_util.h')
| -rw-r--r-- | src/common/string_util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index f8aecc875..ce18a33cf 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,7 +5,6 @@ #pragma once #include <cstddef> -#include <span> #include <string> #include <vector> #include "common/common_types.h" @@ -18,7 +17,7 @@ namespace Common { /// Make a string uppercase [[nodiscard]] std::string ToUpper(std::string str); -[[nodiscard]] std::string StringFromBuffer(std::span<const u8> data); +[[nodiscard]] std::string StringFromBuffer(const std::vector<u8>& data); [[nodiscard]] std::string StripSpaces(const std::string& s); [[nodiscard]] std::string StripQuotes(const std::string& s); |