summaryrefslogtreecommitdiff
path: root/src/common/string_util.h
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.h
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 '')
-rw-r--r--src/common/string_util.h3
1 files changed, 1 insertions, 2 deletions
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 @@
5#pragma once 5#pragma once
6 6
7#include <cstddef> 7#include <cstddef>
8#include <span>
9#include <string> 8#include <string>
10#include <vector> 9#include <vector>
11#include "common/common_types.h" 10#include "common/common_types.h"
@@ -18,7 +17,7 @@ namespace Common {
18/// Make a string uppercase 17/// Make a string uppercase
19[[nodiscard]] std::string ToUpper(std::string str); 18[[nodiscard]] std::string ToUpper(std::string str);
20 19
21[[nodiscard]] std::string StringFromBuffer(std::span<const u8> data); 20[[nodiscard]] std::string StringFromBuffer(const std::vector<u8>& data);
22 21
23[[nodiscard]] std::string StripSpaces(const std::string& s); 22[[nodiscard]] std::string StripSpaces(const std::string& s);
24[[nodiscard]] std::string StripQuotes(const std::string& s); 23[[nodiscard]] std::string StripQuotes(const std::string& s);