summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-08 17:55:24 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-08 17:55:24 +0300
commit9547e64f0f25bb9f50cac9ba9dc035fbc051d4c2 (patch)
treef6ea56864f0d560cc5308d065b12d8744c101fa2
parenta90b8bd891eea8b33b9a6dd2622f6d7ae596be71 (diff)
downloadmanaplus-9547e64f0f25bb9f50cac9ba9dc035fbc051d4c2.tar.gz
manaplus-9547e64f0f25bb9f50cac9ba9dc035fbc051d4c2.tar.bz2
manaplus-9547e64f0f25bb9f50cac9ba9dc035fbc051d4c2.tar.xz
manaplus-9547e64f0f25bb9f50cac9ba9dc035fbc051d4c2.zip
Change timeToStr function parameter type from int to uint32_t.
-rw-r--r--src/utils/stringutils.cpp4
-rw-r--r--src/utils/stringutils.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index ba6e46ee0..041003988 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -909,10 +909,10 @@ std::string removeToken(std::string &str, const std::string &token)
return str;
}
-std::string timeToStr(const int time)
+std::string timeToStr(const uint32_t time)
{
char buf[101];
- const long tempTime = static_cast<long>(time);
+ const uint64_t tempTime = static_cast<uint64_t>(time);
tm *const timeInfo = localtime(reinterpret_cast<const time_t*>(&tempTime));
if (strftime(&buf[0], 100, "%Y-%m-%d_%H-%M-%S", timeInfo))
return std::string(buf);
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 25daf765f..67e91a464 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -256,7 +256,7 @@ uint32_t parseNumber(const std::string &str);
std::string removeToken(std::string &str, const std::string &token);
-std::string timeToStr(const int time);
+std::string timeToStr(const uint32_t time);
std::string timeDiffToString(int timeDiff);