diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2023-02-03 00:08:45 -0500 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2023-02-03 00:08:45 -0500 |
| commit | 7cc5da4a9f8c42eed4a3c57bf5efa08d8de8ec6f (patch) | |
| tree | 195584b8f97867628b4d5bc37ecfff5c20655cf9 /src/common | |
| parent | f14352a7e17a4b857e803680d63e88b4312abe47 (diff) | |
Revert "Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span"
This reverts commit 153fa289d219c37f8344bccfdf67edc6e579d8c8, reversing
changes made to 20676b3b5a1a613af4e498c7cbfdc456339d85a0.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/string_util.cpp | 2 | ||||
| -rw-r--r-- | src/common/string_util.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index b26db47961..e0b6180c55 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -30,7 +30,7 @@ std::string ToUpper(std::string str) { return str; } -std::string StringFromBuffer(const std::vector<u8>& data) { +std::string StringFromBuffer(std::span<const u8> data) { return std::string(data.begin(), std::find(data.begin(), data.end(), '\0')); } diff --git a/src/common/string_util.h b/src/common/string_util.h index ce18a33cfe..f8aecc875e 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -5,6 +5,7 @@ #pragma once #include <cstddef> +#include <span> #include <string> #include <vector> #include "common/common_types.h" @@ -17,7 +18,7 @@ namespace Common { /// Make a string uppercase [[nodiscard]] std::string ToUpper(std::string str); -[[nodiscard]] std::string StringFromBuffer(const std::vector<u8>& data); +[[nodiscard]] std::string StringFromBuffer(std::span<const u8> data); [[nodiscard]] std::string StripSpaces(const std::string& s); [[nodiscard]] std::string StripQuotes(const std::string& s); |
