diff options
| author |  Huw Pascoe | 2017-09-27 00:26:09 +0100 |
|---|---|---|
| committer | Huw Pascoe | 2017-09-30 09:34:35 +0100 |
| commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/common/string_util.h | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| download | yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip | |
Fixed type conversion ambiguity
Diffstat (limited to '')
| -rw-r--r-- | src/common/string_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/string_util.h b/src/common/string_util.h index 075bf4ecb..259360aec 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h | |||
| @@ -33,7 +33,7 @@ inline void CharArrayFromFormat(char (&out)[Count], const char* format, ...) { | |||
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | // Good | 35 | // Good |
| 36 | std::string ArrayToString(const u8* data, u32 size, int line_len = 20, bool spaces = true); | 36 | std::string ArrayToString(const u8* data, size_t size, int line_len = 20, bool spaces = true); |
| 37 | 37 | ||
| 38 | std::string StripSpaces(const std::string& s); | 38 | std::string StripSpaces(const std::string& s); |
| 39 | std::string StripQuotes(const std::string& s); | 39 | std::string StripQuotes(const std::string& s); |