@@ -5270,7 +5270,7 @@ namespace chrono {
52705270 basic_ostream<_CharT, _Traits>& operator<<(
52715271 basic_ostream<_CharT, _Traits>& _Os, const zoned_time<_Duration, _TimeZonePtr>& _Val) {
52725272 const auto _Info = _Val.get_info();
5273- return _Os << _Local_time_format_t<_Duration>{_Val.get_local_time(), &_Info.abbrev};
5273+ return _Os << _Local_time_format_t<common_type_t< _Duration, seconds> >{_Val.get_local_time(), &_Info.abbrev};
52745274 }
52755275
52765276 template <class _CharT>
@@ -6113,11 +6113,10 @@ constexpr bool enable_nonlocking_formatter_optimization<_CHRONO _Local_time_form
61136113
61146114template <class _Duration, class _TimeZonePtr, _Format_supported_charT _CharT>
61156115struct formatter<_CHRONO zoned_time<_Duration, _TimeZonePtr>, _CharT>
6116- : formatter<_CHRONO _Local_time_format_t<_Duration>, _CharT> {
6117-
6116+ : formatter<_CHRONO _Local_time_format_t<common_type_t<_Duration, _CHRONO seconds>>, _CharT> {
61186117 template <class _FormatContext>
61196118 auto format(const _CHRONO zoned_time<_Duration, _TimeZonePtr>& _Val, _FormatContext& _FormatCtx) const {
6120- using _Mybase = formatter<_CHRONO _Local_time_format_t<_Duration>, _CharT>;
6119+ using _Mybase = formatter<_CHRONO _Local_time_format_t<common_type_t< _Duration, _CHRONO seconds> >, _CharT>;
61216120 const auto _Info = _Val.get_info();
61226121 return _Mybase::format({_Val.get_local_time(), &_Info.abbrev, &_Info.offset}, _FormatCtx);
61236122 }
0 commit comments