diff options
| author | bunnei <bunneidev@gmail.com> | 2023-02-03 15:42:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 15:42:18 -0800 |
| commit | 193b513bf544c5dab80d1a849ce62e59e872cd3a (patch) | |
| tree | 665e83a9b6a747f25b30de50350abec1f68d110f /src/common/string_util.h | |
| parent | 9083ad816fc0fca2e39c8c526ae85e3d09db0229 (diff) | |
| parent | 979e4d9950bc7241460524a06e09e87147904d1a (diff) | |
Merge pull request #9719 from ameerj/hle-ipc-span-copy
Revert #9718, Copy HLE Read Buffer for OutputAccessLogToSdCard
Diffstat (limited to 'src/common/string_util.h')
| -rw-r--r-- | src/common/string_util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index ce18a33cf..f8aecc875 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); |