diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-02-13 21:10:27 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-02-13 21:10:27 +1300 |
| commit | 06329e24531b69a4856bbe05a8c89c57d9346de6 (patch) | |
| tree | d2c3cd6256b09ebdc04b8c913b21c2e56d30c2e1 /Source/Core/Common/Timer.cpp | |
| parent | 88526be3b5cfc33436d4390935d7982c4795520a (diff) | |
| parent | 404624bf0b0125e5a408021c616ee9b9e2dde382 (diff) | |
Merge pull request #65 from Tilka/nits
Small changes
Diffstat (limited to 'Source/Core/Common/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 91a2a2d3ad..a2e08bbf1d 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <time.h> +#include <cinttypes> #ifdef _WIN32 #include <Windows.h> @@ -113,7 +114,7 @@ std::string Timer::GetTimeElapsedFormatted() const // Hours u32 Hours = Minutes / 60; - std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03lu", + std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03" PRIu64, Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000); return TmpStr; } |