update {fmt} to 12.1.0
This commit is contained in:
@@ -815,15 +815,7 @@ char* GetLine( FILE* File, char* Line, int* LineNum, int SizeLine )
|
||||
|
||||
wxString GetISO8601CurrentDateTime()
|
||||
{
|
||||
// on msys2 variant mingw64, in fmt::format the %z format
|
||||
// (offset from UTC in the ISO 8601 format, e.g. -0430) does not work,
|
||||
// and is in fact %Z (locale-dependent time zone name or abbreviation) and breaks our date.
|
||||
// However, on msys2 variant ucrt64, it works (this is not the same code in fmt::format)
|
||||
#if defined(__MINGW32__) && !defined(_UCRT)
|
||||
return fmt::format( "{:%FT%T}", fmt::localtime( std::time( nullptr ) ) );
|
||||
#else
|
||||
return fmt::format( "{:%FT%T%z}", fmt::localtime( std::time( nullptr ) ) );
|
||||
#endif
|
||||
return wxDateTime::Now().FormatISOCombined( 'T' );
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user