diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-11 22:35:45 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-11 22:35:45 +0200 |
| commit | 974bf5c427a5b134f09abf48d814f8c8f7e31e3c (patch) | |
| tree | e136c5b86e90ac3d15c679e96c8894428e3476aa /src/server/shared/Utilities/Util.cpp | |
| parent | 5583bcfeeac63477deede2ea744f79ea2710401c (diff) | |
| parent | 38f5c916cf1b4f29b7e0c026af68aac482e9f526 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Accounts/RBAC.h
src/server/game/Battlegrounds/ArenaTeam.cpp
Diffstat (limited to 'src/server/shared/Utilities/Util.cpp')
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 32ff396e1c1..e53f0c9b839 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -215,7 +215,8 @@ uint32 TimeStringToSecs(const std::string& timestring) std::string TimeToTimestampStr(time_t t) { - tm* aTm = localtime(&t); + tm aTm; + ACE_OS::localtime_r(&t, &aTm); // YYYY year // MM month (2 digits 01-12) // DD day (2 digits 01-31) @@ -223,7 +224,7 @@ std::string TimeToTimestampStr(time_t t) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) char buf[20]; - snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm->tm_year+1900, aTm->tm_mon+1, aTm->tm_mday, aTm->tm_hour, aTm->tm_min, aTm->tm_sec); + snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm.tm_year+1900, aTm.tm_mon+1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); return std::string(buf); } |