summaryrefslogtreecommitdiff
path: root/src/common/string_util.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2023-02-02 19:04:50 -0800
committerGravatar GitHub2023-02-02 19:04:50 -0800
commit25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd (patch)
treea86c945d2e8789250005ac38ebbb36c48e95b30c /src/common/string_util.cpp
parentMerge pull request #9704 from liamwhite/das (diff)
parentRevert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ... (diff)
downloadyuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.gz
yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.tar.xz
yuzu-25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd.zip
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.cpp')
-rw-r--r--src/common/string_util.cpp2
1 files changed, 1 insertions, 1 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) {
30 return str; 30 return str;
31} 31}
32 32
33std::string StringFromBuffer(std::span<const u8> data) { 33std::string StringFromBuffer(const std::vector<u8>& data) {
34 return std::string(data.begin(), std::find(data.begin(), data.end(), '\0')); 34 return std::string(data.begin(), std::find(data.begin(), data.end(), '\0'));
35} 35}
36 36