diff options
| author | 2018-09-15 15:21:06 +0200 | |
|---|---|---|
| committer | 2018-09-15 15:21:06 +0200 | |
| commit | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (patch) | |
| tree | 8a90e8ef2804f147dff7225a543a8740ecf7160c /src/common/string_util.h | |
| parent | Merge pull request #1310 from lioncash/kernel-ns (diff) | |
| download | yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.gz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.xz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.zip | |
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.h | 4 |
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); | |||
| 19 | /// Make a string uppercase | 19 | /// Make a string uppercase |
| 20 | std::string ToUpper(std::string str); | 20 | std::string ToUpper(std::string str); |
| 21 | 21 | ||
| 22 | std::string ArrayToString(const u8* data, size_t size, int line_len = 20, bool spaces = true); | 22 | std::string ArrayToString(const u8* data, std::size_t size, int line_len = 20, bool spaces = true); |
| 23 | 23 | ||
| 24 | std::string StringFromBuffer(const std::vector<u8>& data); | 24 | std::string StringFromBuffer(const std::vector<u8>& data); |
| 25 | 25 | ||
| @@ -118,7 +118,7 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) { | |||
| 118 | * Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't | 118 | * Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't |
| 119 | * NUL-terminated then the string ends at max_len characters. | 119 | * NUL-terminated then the string ends at max_len characters. |
| 120 | */ | 120 | */ |
| 121 | std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len); | 121 | std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len); |
| 122 | 122 | ||
| 123 | /** | 123 | /** |
| 124 | * Attempts to trim an arbitrary prefix from `path`, leaving only the part starting at `root`. It's | 124 | * Attempts to trim an arbitrary prefix from `path`, leaving only the part starting at `root`. It's |