From: Jonathan Wakely Date: Fri, 27 Sep 2024 15:54:31 +0000 (+0100) Subject: libstdc++: Tweak %c formatting for chrono types X-Git-Tag: basepoints/gcc-16~5349 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce89d2f3170e0d6474cee2c5cb9d478426a5b2f6;p=thirdparty%2Fgcc.git libstdc++: Tweak %c formatting for chrono types libstdc++-v3/ChangeLog: * include/bits/chrono_io.h (__formatter_chrono::_M_c): Add [[unlikely]] attribute to condition for missing %c format in locale. Use %T instead of %H:%M:%S in fallback. --- diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index a337007266e..652e88ffe3a 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -899,8 +899,8 @@ namespace __format const _CharT* __formats[2]; __tp._M_date_time_formats(__formats); const _CharT* __rep = __formats[__mod]; - if (!*__rep) - __rep = _GLIBCXX_WIDEN("%a %b %e %H:%M:%S %Y"); + if (!*__rep) [[unlikely]] + __rep = _GLIBCXX_WIDEN("%a %b %e %T %Y"); basic_string<_CharT> __fmt(_S_empty_spec); __fmt.insert(1u, 1u, _S_colon); __fmt.insert(2u, __rep);