summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-01-30 21:17:09 +0100
committerGitHub <noreply@github.com>2023-01-30 21:17:09 +0100
commited4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch)
tree54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/common
parentMerge pull request #9701 from german77/common_protocol (diff)
parenthle_ipc: Use thread_local ReadBuffer (diff)
downloadyuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.gz
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.bz2
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.lz
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.xz
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.zst
yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/string_util.cpp2
-rw-r--r--src/common/string_util.h3
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);