Skip to content

F
fmt
Commit d9fd695a authored by Vladislav Shchapov's avatar Vladislav Shchapov Committed by Victor Zverovich
Browse files
Options

Fix wchar_t tm formatting

parent 92614ecb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
include/fmt/chrono.h
View file @ d9fd695a
...@@ -564,10 +564,13 @@ template <typename Char> struct formatter<std::tm, Char> { ...@@ -564,10 +564,13 @@ template <typename Char> struct formatter<std::tm, Char> {
while (end != ctx.end() && *end != '}') ++end; while (end != ctx.end() && *end != '}') ++end;
auto size = detail::to_unsigned(end - it); auto size = detail::to_unsigned(end - it);
specs = {it, size}; specs = {it, size};
if (specs == string_view("%F", 2)) // basic_string_view<>::compare isn't constexpr before C++17
spec_ = spec::year_month_day; if (specs.size() == 2 && specs[0] == Char('%')) {
else if (specs == string_view("%T", 2)) if (specs[1] == Char('F'))
spec_ = spec::hh_mm_ss; spec_ = spec::year_month_day;
else if (specs[1] == Char('T'))
spec_ = spec::hh_mm_ss;
}
return end; return end;
} }
......
test/xchar-test.cc
View file @ d9fd695a
...@@ -261,6 +261,8 @@ TEST(xchar_test, chrono) { ...@@ -261,6 +261,8 @@ TEST(xchar_test, chrono) {
EXPECT_EQ(fmt::format("The date is {:%Y-%m-%d %H:%M:%S}.", tm), EXPECT_EQ(fmt::format("The date is {:%Y-%m-%d %H:%M:%S}.", tm),
"The date is 2016-04-25 11:22:33."); "The date is 2016-04-25 11:22:33.");
EXPECT_EQ(L"42s", fmt::format(L"{}", std::chrono::seconds(42))); EXPECT_EQ(L"42s", fmt::format(L"{}", std::chrono::seconds(42)));
EXPECT_EQ(fmt::format(L"{:%F}", tm), L"2016-04-25");
EXPECT_EQ(fmt::format(L"{:%T}", tm), L"11:22:33");
} }
TEST(xchar_test, color) { TEST(xchar_test, color) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment