diff options
| author | flacs <tilkax@gmail.com> | 2015-09-11 14:08:58 +0000 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-11 14:08:58 +0000 |
| commit | c07d672b31f119e17dabe68856e66ec62e87583c (patch) | |
| tree | 824183d94473f38a8c0f73cdf6b65776c4cbe20a /Source/Core/Common/Timer.cpp | |
| parent | c319fbb98d8d53a601800a8082ec6a56425fc993 (diff) | |
| parent | 19459e827f6c15f9429598015019ecb66f2e6cad (diff) | |
Merge pull request #3003 from dolphin-emu/revert-2961-printf
Partially revert "General: Toss out PRI macro usage"
Diffstat (limited to 'Source/Core/Common/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 079e4db544..451e6a0725 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -147,7 +147,7 @@ std::string Timer::GetTimeElapsedFormatted() const // Hours u32 Hours = Minutes / 60; - std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03llu", + std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03" PRIu64, Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000); return TmpStr; } |