Replaced all ACE_OS::localtime_r calls

5 files changed, 13 insertions, 10 deletions

diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index a4fc93e119c..2b38f9886c3 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -21,7 +21,8 @@
 
 std::string LogMessage::getTimeStr(time_t time)
 {
-    tm aTm = localtime_r(time);
+    tm aTm;
+    localtime_r(&time, &aTm);
     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);
     return std::string(buf);
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index bb8cb1719c8..5f1c284d80d 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -285,7 +285,8 @@ std::string Log::GetTimestampStr()
 {
     time_t tt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
-    std::tm aTm = localtime_r(tt);
+    std::tm aTm;
+    localtime_r(&tt, &aTm);
 
     //       YYYY   year
     //       MM     month (2 digits 01-12)
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 73b8f6b336f..c375a3ffa75 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -460,7 +460,8 @@ class ByteBuffer
 
         void AppendPackedTime(time_t time)
         {
-            tm lt = localtime_r(time);
+            tm lt;
+            localtime_r(&time, &lt);
             append<uint32>((lt.tm_year - 100) << 24 | lt.tm_mon  << 20 | (lt.tm_mday - 1) << 14 | lt.tm_wday << 11 | lt.tm_hour << 6 | lt.tm_min);
         }
 
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index c766cc3ca91..f80730af05d 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -139,15 +139,14 @@ void stripLineInvisibleChars(std::string &str)
 
 }
 
-std::tm localtime_r(const time_t& time)
+struct tm* localtime_r(const time_t* time, struct tm *result)
 {
-    std::tm tm_snapshot;
 #if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
-    localtime_s(&tm_snapshot, &time);
+    localtime_s(result, time);
+    return result;
 #else
-    localtime_r(&time, &tm_snapshot); // POSIX
+    return localtime_r(&time, &result); // POSIX
 #endif
-    return tm_snapshot;
 }
 
 
@@ -239,7 +238,8 @@ uint32 TimeStringToSecs(const std::string& timestring)
 
 std::string TimeToTimestampStr(time_t t)
 {
-    tm aTm = localtime_r(t);
+    tm aTm;
+    localtime_r(&t, &aTm);
     //       YYYY   year
     //       MM     month (2 digits 01-12)
     //       DD     day (2 digits 01-31)
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index af28afd66ff..21e5ac2ce0f 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -70,7 +70,7 @@ void stripLineInvisibleChars(std::string &src);
 
 int32 MoneyStringToMoney(const std::string& moneyString);
 
-std::tm localtime_r(const time_t& time);
+struct tm* localtime_r(const time_t* time, struct tm *result);
 
 std::string secsToTimeString(uint64 timeInSecs, bool shortText = false, bool hoursOnly = false);
 uint32 TimeStringToSecs(const std::string& timestring);