coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-07 01:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 666a7e47a3e251a732fe2ec7ee4e39514df0ae1f into 1b96fa13f549387b7549cc89e1a785cf143a1a50

Browse Source
This commit is contained in:
Gaspard Petit 2025-11-14 12:17:46 +08:00 committed by GitHub
commit 6a6e91e016
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
googletest/include/gtest/internal/gtest-port.h
View File

@ -2376,4 +2376,32 @@ using StringView = ::std::string_view;
#define GTEST_INTERNAL_HAS_COMPARE_LIB 0 #define GTEST_INTERNAL_HAS_COMPARE_LIB 0
#endif #endif
#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_ #endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_

17
googletest/src/gtest.cc
View File

@ -4170,22 +4170,7 @@ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) {
} }
static bool PortableLocaltime(time_t seconds, struct tm* out) { static bool PortableLocaltime(time_t seconds, struct tm* out) {
#if defined(_MSC_VER) return internal::LocalTime(seconds, out);
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
} }
// Converts the given epoch time in milliseconds to a date string in the ISO // Converts the given epoch time in milliseconds to a date string in the ISO