From 015e5dab03568f68c0684e66c7bbd6a6c94b853e Mon Sep 17 00:00:00 2001 From: cdigruttola Date: Wed, 3 Jun 2020 12:33:42 +0200 Subject: [PATCH] add check for gcc version less than 5 due to missing std::put_time --- .gitignore | 4 ++++ CMakeLists.txt | 4 ++++ src/oatpp/core/base/Environment.cpp | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b11d4c2d..1a29e37e 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,7 @@ test/build/ Dockerfile +# VS +.vs/ +out/ +CMakeSettings.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f2f9057..f3eef21e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,10 @@ if(OATPP_DISABLE_LOGE) add_definitions(-DOATPP_DISABLE_LOGE) endif() +if(CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.0) + add_definitions(-DOATPP_DISABLE_STD_PUT_TIME) +endif() + message("\n############################################################################\n") ################################################################################################### diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp index bbc92378..e05dae6b 100644 --- a/src/oatpp/core/base/Environment.cpp +++ b/src/oatpp/core/base/Environment.cpp @@ -90,10 +90,16 @@ void DefaultLogger::log(v_int32 priority, const std::string& tag, const std::str } if(m_config.timeFormat) { - time_t seconds = std::chrono::duration_cast(time).count(); + time_t seconds = std::chrono::duration_cast(time).count(); struct tm now; localtime_r(&seconds, &now); - std::cout << std::put_time(&now, m_config.timeFormat); +#ifdef OATPP_DISABLE_STD_PUT_TIME + char timeBuffer[50]; + strftime(timeBuffer, sizeof(timeBuffer), m_config.timeFormat, &now); + std::cout << timeBuffer; +#else + std::cout << std::put_time(&now, m_config.timeFormat); +#endif indent = true; }