diff options
author | bunnei <bunneidev@gmail.com> | 2023-02-04 00:42:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-04 00:42:18 +0100 |
commit | 193b513bf544c5dab80d1a849ce62e59e872cd3a (patch) | |
tree | 665e83a9b6a747f25b30de50350abec1f68d110f /src/common | |
parent | Merge pull request #9713 from unfamiliarplace/master (diff) | |
parent | fsp_srv: Copy HLE Read Buffer for OutputAccessLogToSdCard (diff) | |
download | yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar.gz yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar.bz2 yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar.lz yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar.xz yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.tar.zst yuzu-193b513bf544c5dab80d1a849ce62e59e872cd3a.zip |
Diffstat (limited to '')
-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 b26db4796..e0b6180c5 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 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); |