aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Logging/Log.cpp
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2014-06-08 20:08:43 +0200
committerleak <leak@bitmx.net>2014-06-08 20:08:43 +0200
commit0dd10269d15b11b3beb0cb1b8537e15126699d32 (patch)
treeef2869752124e71ce868cd1def44079abed0e534 /src/server/shared/Logging/Log.cpp
parentfdd5e11a15a4e635bb1298c3d4c4b3c9e718e6b0 (diff)
Replaced dependencies on ace/OS_NS_time.h
Diffstat (limited to 'src/server/shared/Logging/Log.cpp')
-rw-r--r--src/server/shared/Logging/Log.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index bc002668b3b..bb8cb1719c8 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -283,9 +283,10 @@ void Log::write(LogMessage* msg)
std::string Log::GetTimestampStr()
{
- time_t t = time(NULL);
- tm aTm;
- ACE_OS::localtime_r(&t, &aTm);
+ time_t tt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+
+ std::tm aTm = localtime_r(tt);
+
// YYYY year
// MM month (2 digits 01-12)
// DD day (2 digits 01-31)