AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-10 13:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #2670 (#2671)

Browse Source
This commit is contained in:
Vladislav Shchapov 2021-12-24 01:38:48 +05:00 committed by GitHub
parent 817788fbf0
commit 04111dd1e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/fmt/chrono.h
View File

@ -1076,34 +1076,41 @@ template <typename OutputIt, typename Char> class tm_writer {
write2(static_cast<int>(offset / 60)); write2(static_cast<int>(offset / 60));
write2(static_cast<int>(offset % 60)); write2(static_cast<int>(offset % 60));
} }
void format_utc_offset_impl(std::true_type) { template <typename T, FMT_ENABLE_IF(has_member_data_tm_gmtoff<T>::value)>
write_utc_offset(tm_.tm_gmtoff); void format_utc_offset_impl(const T& tm) {
write_utc_offset(tm.tm_gmtoff);
} }
void format_utc_offset_impl(std::false_type) { template <typename T, FMT_ENABLE_IF(!has_member_data_tm_gmtoff<T>::value)>
void format_utc_offset_impl(const T& tm) {
#if defined(_WIN32) #if defined(_WIN32)
# if FMT_USE_TZSET # if FMT_USE_TZSET
tzset_once(); tzset_once();
# endif # endif
long offset = 0; long offset = 0;
_get_timezone(&offset); _get_timezone(&offset);
if (tm_.tm_isdst) { if (tm.tm_isdst) {
long dstbias = 0; long dstbias = 0;
_get_dstbias(&dstbias); _get_dstbias(&dstbias);
offset += dstbias; offset += dstbias;
} }
write_utc_offset(-offset); write_utc_offset(-offset);
#else #else
ignore_unused(tm);
format_localized('z'); format_localized('z');
#endif #endif
} }
void format_tz_name_impl(std::true_type) { template <typename T, FMT_ENABLE_IF(has_member_data_tm_zone<T>::value)>
void format_tz_name_impl(const T& tm) {
if (is_classic_) if (is_classic_)
out_ = write_tm_str<Char>(out_, tm_.tm_zone, loc_); out_ = write_tm_str<Char>(out_, tm.tm_zone, loc_);
else else
format_localized('Z'); format_localized('Z');
} }
void format_tz_name_impl(std::false_type) { format_localized('Z'); } template <typename T, FMT_ENABLE_IF(!has_member_data_tm_zone<T>::value)>
void format_tz_name_impl(const T&) {
format_localized('Z');
}
void format_localized(char format, char modifier = 0) { void format_localized(char format, char modifier = 0) {
out_ = write<Char>(out_, tm_, loc_, format, modifier); out_ = write<Char>(out_, tm_, loc_, format, modifier);
@ -1211,10 +1218,8 @@ template <typename OutputIt, typename Char> class tm_writer {
out_ = copy_str<Char>(std::begin(buf) + offset, std::end(buf), out_); out_ = copy_str<Char>(std::begin(buf) + offset, std::end(buf), out_);
} }
void on_utc_offset() { void on_utc_offset() { format_utc_offset_impl(tm_); }
format_utc_offset_impl(has_member_data_tm_gmtoff<std::tm>{}); void on_tz_name() { format_tz_name_impl(tm_); }
}
void on_tz_name() { format_tz_name_impl(has_member_data_tm_zone<std::tm>{}); }
void on_year(numeric_system ns) { void on_year(numeric_system ns) {
if (is_classic_ || ns == numeric_system::standard) if (is_classic_ || ns == numeric_system::standard)