3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2165 from catchorg/devel-gmtime-fixup

Browse Source 
Use gmtime_r instead of gmtime when compiling for posixy platforms
This commit is contained in:
Martin Hořeňovský 2021-01-27 19:55:41 +01:00 committed by GitHub
commit 2dbe63a6ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/catch2/reporters/catch_reporter_junit.cpp
View File

@ -22,28 +22,22 @@ namespace Catch {
namespace { namespace {
std::string getCurrentTimestamp() { std::string getCurrentTimestamp() {
// Beware, this is not reentrant because of backward compatibility issues
// Also, UTC only, again because of backward compatibility (%z is C++11)
time_t rawtime; time_t rawtime;
std::time(&rawtime); std::time(&rawtime);
auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
#ifdef _MSC_VER
std::tm timeInfo = {}; std::tm timeInfo = {};
#ifdef _MSC_VER
gmtime_s(&timeInfo, &rawtime); gmtime_s(&timeInfo, &rawtime);
#else #else
std::tm* timeInfo; gmtime_r(&rawtime, &timeInfo);
timeInfo = std::gmtime(&rawtime);
#endif #endif
auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
char timeStamp[timeStampSize]; char timeStamp[timeStampSize];
const char * const fmt = "%Y-%m-%dT%H:%M:%SZ"; const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
#ifdef _MSC_VER
std::strftime(timeStamp, timeStampSize, fmt, &timeInfo); std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
#else
std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
#endif
return std::string(timeStamp); return std::string(timeStamp);
} }