From c476e6704bebdc0125a8f7bb07e02083a7e94940 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 12 Jan 2025 20:13:24 -0500 Subject: [PATCH] revert workarounds for Intel ICC 19.x --- src/timer.cpp | 7 +++---- src/utils.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/timer.cpp b/src/timer.cpp index c7bd622409..e448e73f2c 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -15,6 +15,7 @@ #include "comm.h" #include "error.h" +#include "fmt/chrono.h" #include "tokenizer.h" #include @@ -259,10 +260,8 @@ void Timer::modify_params(int narg, char **arg) // format timeout setting std::string timeout = "off"; if (_timeout >= 0.0) { - std::time_t to = (std::time_t) _timeout; - std::tm *tv = std::gmtime(&to); - timeout = fmt::format("{:02d}:{:02d}:{:02d}", tv->tm_yday * 24 + tv->tm_hour, tv->tm_min, - tv->tm_sec); + std::tm tv = fmt::gmtime((std::time_t) _timeout); + timeout = fmt::format("{:02d}:{:%M:%S}", tv.tm_yday * 24 + tv.tm_hour, tv); } utils::logmesg(lmp, "New timer settings: style={} mode={} timeout={}\n", timer_style[_level], diff --git a/src/utils.cpp b/src/utils.cpp index 3ee48ab702..0f5b50baf2 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1804,7 +1804,7 @@ std::string utils::current_date() { time_t tv = time(nullptr); std::tm today = fmt::localtime(tv); - return fmt::format("{:04d}-{:02d}-{:02d}", 1900 + today.tm_year, 1 + today.tm_mon, today.tm_mday); + return fmt::format("{:%Y-%m-%d}", today); } /* ----------------------------------------------------------------------