3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-03 22:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix StringMaker for time_point<system_clock> with non-default duration

Browse Source 
Fixes #2685
This commit is contained in:
Martin Hořeňovský
2025-08-01 23:00:30 +02:00
parent fbfd13501c
commit 17fe5eaa5c
19 changed files with 101 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/catch2/catch_tostring.hpp
View File

@@ -626,17 +626,19 @@ struct ratio_string<std::milli> {
template<typename Duration>
struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
auto converted = std::chrono::system_clock::to_time_t(time_point);
const auto systemish = std::chrono::time_point_cast<
std::chrono::system_clock::duration>( time_point );
const auto as_time_t = std::chrono::system_clock::to_time_t( systemish );
#ifdef _MSC_VER
std::tm timeInfo = {};
const auto err = gmtime_s(&timeInfo, &converted);
const auto err = gmtime_s( &timeInfo, &as_time_t );
if ( err ) {
return "gmtime from provided timepoint has failed. This "
"happens e.g. with pre-1970 dates using Microsoft libc";
}
#else
std::tm* timeInfo = std::gmtime(&converted);
std::tm* timeInfo = std::gmtime( &as_time_t );
#endif
auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");