summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/string_util.cpp2
-rw-r--r--src/common/string_util.h3
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) {
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
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);