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.cpp | |
| 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 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index bad311793..6959915fa 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp | |||
| @@ -117,7 +117,7 @@ std::string StringFromFormat(const char* format, ...) { | |||
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | // For Debugging. Read out an u8 array. | 119 | // For Debugging. Read out an u8 array. |
| 120 | std::string ArrayToString(const u8* data, u32 size, int line_len, bool spaces) { | 120 | std::string ArrayToString(const u8* data, size_t size, int line_len, bool spaces) { |
| 121 | std::ostringstream oss; | 121 | std::ostringstream oss; |
| 122 | oss << std::setfill('0') << std::hex; | 122 | oss << std::setfill('0') << std::hex; |
| 123 | 123 | ||