summaryrefslogtreecommitdiff
path: root/src/common/string_util.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-17 09:51:47 -0400
committerGitHub <noreply@github.com>2018-09-17 09:51:47 -0400
commit076add4ccddff3940e20fc320615e3d330f77119 (patch)
treebacabcfed8665974c276489509a1caa330ad36a2 /src/common/string_util.h
parent3be048e50a2090caf1eeeb2373c7524ecc177ce8 (diff)
parent63c2e32e207d31ecadd9022e1d7cd705c9febac8 (diff)
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/common/string_util.h')
-rw-r--r--src/common/string_util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 4a2143b59..dcca6bc38 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -19,7 +19,7 @@ std::string ToLower(std::string str);
/// Make a string uppercase
std::string ToUpper(std::string str);
-std::string ArrayToString(const u8* data, size_t size, int line_len = 20, bool spaces = true);
+std::string ArrayToString(const u8* data, std::size_t size, int line_len = 20, bool spaces = true);
std::string StringFromBuffer(const std::vector<u8>& data);
@@ -118,7 +118,7 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) {
* Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't
* NUL-terminated then the string ends at max_len characters.
*/
-std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len);
+std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len);
/**
* Attempts to trim an arbitrary prefix from `path`, leaving only the part starting at `root`. It's