aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-06-30 23:32:45 +0200
committerMihai Moldovan <ionic@ionic.de>2017-10-27 08:46:39 +0200
commitfc4a18d3398ec360b28802dff990e2c1c8d368b5 (patch)
tree60c0c13e50e372524f328925d6b76251e4c0066e /nxcomp/src
parent67b0a17faa5240ee924cd90f496a412339d00356 (diff)
downloadnx-libs-fc4a18d3398ec360b28802dff990e2c1c8d368b5.tar.gz
nx-libs-fc4a18d3398ec360b28802dff990e2c1c8d368b5.tar.bz2
nx-libs-fc4a18d3398ec360b28802dff990e2c1c8d368b5.zip
nxcomp/{configure.ac,Log.cpp}: implement configure-time std::put_time check and use macro value in Log.cpp.
Diffstat (limited to 'nxcomp/src')
-rw-r--r--nxcomp/src/Log.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp
index 3ff47aea8..66ae1bd78 100644
--- a/nxcomp/src/Log.cpp
+++ b/nxcomp/src/Log.cpp
@@ -31,6 +31,7 @@
#include <iomanip>
#include "Log.h"
+#include "config.h"
NXLog nx_log;
@@ -78,7 +79,7 @@ std::string NXLog::stamp_to_string(const NXLogStamp& stamp) const
}
else
{
- #if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ >= 5)
+ #if HAVE_STD_PUT_TIME
oss << " " << std::put_time(&timeinfo, "%Y/%m/%d %H:%M:%S");
#else
oss << timestamp.tv_sec;