summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Timer.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-07 00:18:12 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-07 00:18:12 +0100
commit4c6d4cc27092ffbdd7be3483b83e355fbc115f4e (patch)
tree8b2af8ad3894ec5f751ab2c2c0b5563e9fa6d149 /Source/Core/Common/Timer.cpp
parent8ad6f154a4fe64564d18598bb5fab70cc89d70c4 (diff)
parent70d2592ffbbb2252d5ac998ce4d3200175a5951c (diff)
Merge pull request #41 from Parlane/printf_warnings
Give StringFromFormat a printf format attribute.
Diffstat (limited to 'Source/Core/Common/Timer.cpp')
-rw-r--r--Source/Core/Common/Timer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index b7ae848970..267755fb17 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -113,7 +113,7 @@ std::string Timer::GetTimeElapsedFormatted() const
// Hours
u32 Hours = Minutes / 60;
- std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03i",
+ std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03lu",
Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000);
return TmpStr;
}