feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Improve consistency

Browse Source
This commit is contained in:
Victor Zverovich
2021-11-13 08:59:56 -08:00
parent 5380ff4d88
commit 8b89454994
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/fmt/chrono.h
View File

@@ -993,7 +993,7 @@ template <typename OutputIt, typename Char> class tm_writer {
} }
public: public:
explicit tm_writer(const std::locale& loc, OutputIt out, const std::tm& tm) tm_writer(const std::locale& loc, OutputIt out, const std::tm& tm)
: loc_(loc), : loc_(loc),
is_classic_(loc_ == get_classic_locale()), is_classic_(loc_ == get_classic_locale()),
out_(out), out_(out),
@@ -1374,25 +1374,24 @@ OutputIt format_duration_unit(OutputIt out) {
return out; return out;
} }
struct get_locale { class get_locale {
explicit get_locale(bool localized, locale_ref loc_ref)
: has_locale{localized} {
if (localized)
::new (&locale) std::locale{loc_ref.template get<std::locale>()};
}
~get_locale() {
if (has_locale) locale.~locale();
}
operator const std::locale&() const {
return has_locale ? locale : get_classic_locale();
}
private: private:
union { union {
monostate dummy{}; std::locale locale_;
std::locale locale;
}; };
bool has_locale = false; bool has_locale_ = false;
public:
get_locale(bool localized, locale_ref loc) : has_locale_(localized) {
if (localized)
::new (&locale_) std::locale(loc.template get<std::locale>());
}
~get_locale() {
if (has_locale_) locale_.~locale();
}
operator const std::locale&() const {
return has_locale_ ? locale_ : get_classic_locale();
}
}; };
template <typename FormatContext, typename OutputIt, typename Rep, template <typename FormatContext, typename OutputIt, typename Rep,
@@ -1414,8 +1413,8 @@ struct chrono_formatter {
using char_type = typename FormatContext::char_type; using char_type = typename FormatContext::char_type;
explicit chrono_formatter(FormatContext& ctx, OutputIt o, chrono_formatter(FormatContext& ctx, OutputIt o,
std::chrono::duration<Rep, Period> d) std::chrono::duration<Rep, Period> d)
: context(ctx), : context(ctx),
out(o), out(o),
val(static_cast<rep>(d.count())), val(static_cast<rep>(d.count())),
@@ -1497,7 +1496,7 @@ struct chrono_formatter {
void format_localized(const tm& time, char format, char modifier = 0) { void format_localized(const tm& time, char format, char modifier = 0) {
if (isnan(val)) return write_nan(); if (isnan(val)) return write_nan();
out = detail::write<char_type>( out = detail::write<char_type>(
out, time, get_locale{localized, context.locale()}, format, modifier); out, time, get_locale(localized, context.locale()), format, modifier);
} }
void on_text(const char_type* begin, const char_type* end) { void on_text(const char_type* begin, const char_type* end) {
@@ -1665,7 +1664,7 @@ template <typename Char> struct formatter<weekday, Char> {
auto time = std::tm(); auto time = std::tm();
time.tm_wday = static_cast<int>(wd.c_encoding()); time.tm_wday = static_cast<int>(wd.c_encoding());
return detail::write<Char>( return detail::write<Char>(
ctx.out(), time, detail::get_locale{localized, ctx.locale()}, 'a'); ctx.out(), time, detail::get_locale(localized, ctx.locale()), 'a');
} }
}; };
@@ -1863,9 +1862,9 @@ template <typename Char> struct formatter<std::tm, Char> {
template <typename FormatContext> template <typename FormatContext>
auto format(const std::tm& tm, FormatContext& ctx) const auto format(const std::tm& tm, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
const auto loc_ref = ctx.locale(); const auto loc = ctx.locale();
return this->do_format( return this->do_format(ctx.out(), tm,
ctx.out(), tm, detail::get_locale{static_cast<bool>(loc_ref), loc_ref}); detail::get_locale(static_cast<bool>(loc), loc));
} }
}; };