diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 08:22:14 -0500 |
| commit | 53d74215b24d4e390f380bc8aa113cdcbf377148 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/common/string_util.cpp | |
| parent | e2a34ccd8925a311edf4d8c04164fa0c569f2ea7 (diff) | |
| parent | da1c8d152285c5ed4b2dcb9915b886555c99610f (diff) | |
Merge pull request #2962 from huwpascoe/static_cast
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 bad311793d..6959915faa 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -117,7 +117,7 @@ std::string StringFromFormat(const char* format, ...) { } // For Debugging. Read out an u8 array. -std::string ArrayToString(const u8* data, u32 size, int line_len, bool spaces) { +std::string ArrayToString(const u8* data, size_t size, int line_len, bool spaces) { std::ostringstream oss; oss << std::setfill('0') << std::hex; |