diff options
author | bunnei <bunneidev@gmail.com> | 2023-02-03 04:04:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-03 04:04:50 +0100 |
commit | 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd (patch) | |
tree | a86c945d2e8789250005ac38ebbb36c48e95b30c /src/common | |
parent | Merge pull request #9704 from liamwhite/das (diff) | |
parent | Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer" (diff) | |
download | yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.gz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.bz2 yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.lz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.xz yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.zst yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.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, 2 insertions, 3 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index e0b6180c5..b26db4796 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(std::span<const u8> data) { +std::string StringFromBuffer(const std::vector<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 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); |