From 3dc16db278fcd9c7d32fe5253abd7d8825b6e186 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 26 Sep 2024 17:05:02 -0500 Subject: [PATCH] changes --- .../librepertory/src/providers/s3/s3_provider.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp index 18c4b4c8..0d8faaed 100644 --- a/repertory/librepertory/src/providers/s3/s3_provider.cpp +++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp @@ -73,10 +73,16 @@ auto s3_provider::convert_api_date(std::string_view date) -> std::uint64_t { struct tm tm1 {}; #if defined(_WIN32) utils::time::strptime(date_time.c_str(), "%Y-%m-%dT%T", &tm1); - return nanos + utils::time::windows_time_t_to_unix_time(_mkgmtime(&tm1)); + auto utc_time = _mkgmtime(&tm1); + localtime_s(&tm1, &utc_time); + return nanos + utils::time::windows_time_t_to_unix_time(mktime(&tm1)); #else // !defined(_WIN32) strptime(date_time.c_str(), "%Y-%m-%dT%T", &tm1); - return nanos + (static_cast(timegm(&tm1)) * + auto utc_time = timegm(&tm1); + auto *utc_tm = localtime(&utc_time); + if (utc_tm != nullptr) { + } + return nanos + (static_cast(mktime(&tm1)) * utils::time::NANOS_PER_SECOND); #endif // defined(_WIN32) }