Move the LocalTime implementation to gtest-port.h

Move the LocalTime implementation to gtest-port.h so it can be customized for each port
This commit is contained in:
Gaspard Petit 2022-05-30 12:45:06 -04:00
parent 9d21db9e0a
commit 7f23a1e1c1
2 changed files with 29 additions and 16 deletions

View File

@ -2405,4 +2405,32 @@ using Variant = ::std::variant<T...>;
#endif // __has_include
#endif // GTEST_HAS_ABSL
#ifndef GTEST_INTERNAL_LOCALTIME_
#include <time.h> // NOLINT
namespace testing {
namespace internal {
inline bool LocalTime(time_t seconds, struct tm* out) {
#if defined(_MSC_VER)
return localtime_s(out, &seconds) == 0;
#elif defined(__MINGW32__) || defined(__MINGW64__)
// MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
// Windows' localtime(), which has a thread-local tm buffer.
struct tm* tm_ptr = localtime(&seconds); // NOLINT
if (tm_ptr == nullptr) return false;
*out = *tm_ptr;
return true;
#elif defined(__STDC_LIB_EXT1__)
// Uses localtime_s when available as localtime_r is only available from
// C23 standard.
return localtime_s(&seconds, out) != nullptr;
#else
return localtime_r(&seconds, out) != nullptr;
#endif
}
} // namespace internal
} // namespace testing
#endif // GTEST_INTERNAL_LOCALTIME_
#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_

View File

@ -4103,22 +4103,7 @@ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
}
static bool PortableLocaltime(time_t seconds, struct tm* out) {
#if defined(_MSC_VER)
return localtime_s(out, &seconds) == 0;
#elif defined(__MINGW32__) || defined(__MINGW64__)
// MINGW <time.h> provides neither localtime_r nor localtime_s, but uses
// Windows' localtime(), which has a thread-local tm buffer.
struct tm* tm_ptr = localtime(&seconds); // NOLINT
if (tm_ptr == nullptr) return false;
*out = *tm_ptr;
return true;
#elif defined(__STDC_LIB_EXT1__)
// Uses localtime_s when available as localtime_r is only available from
// C23 standard.
return localtime_s(&seconds, out) != nullptr;
#else
return localtime_r(&seconds, out) != nullptr;
#endif
return internal::LocalTime(seconds, out);
}
// Converts the given epoch time in milliseconds to a date string in the ISO