External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gcc test

Browse Source
This commit is contained in:
Walter Gray 2020-11-30 13:17:48 -08:00
parent aa65e99969
commit 54d6d5bc84
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/ranges.h
View File

@ -292,9 +292,9 @@ struct formatter<TupleT, Char, enable_if_t<fmt::is_tuple_like<TupleT>::value>> {
out = detail::copy(formatting.delimiter, out); out = detail::copy(formatting.delimiter, out);
} }
out = vformat_to(out, out = vformat_to(out,
detail::format_str_quoted( to_string_view(detail::format_str_quoted(
(formatting.add_delimiter_spaces && i > 0), v), (formatting.add_delimiter_spaces && i > 0), v)),
make_format_args(v)); make_format_args(v));
++i; ++i;
} }
@ -367,9 +367,9 @@ struct formatter<
out = detail::copy(formatting.delimiter, out); out = detail::copy(formatting.delimiter, out);
} }
out = vformat_to(out, out = vformat_to(out,
detail::format_str_quoted( to_string_view(detail::format_str_quoted(
(formatting.add_delimiter_spaces && i > 0), *it), (formatting.add_delimiter_spaces && i > 0), *it)),
make_format_args(*it)); make_format_args(*it));
if (++i > formatting.range_length_limit) { if (++i > formatting.range_length_limit) {
out = format_to(out, FMT_STRING(" ... <other elements>")); out = format_to(out, FMT_STRING(" ... <other elements>"));
break; break;

4
test/enforce-compiletime-test.cc
View File

@ -114,7 +114,7 @@ TEST(FormatTest, CustomFormatCompileTimeString) {
EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), const_answer)); EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), const_answer));
} }
#if FMT_USE_USER_DEFINED_LITERALS #if FMT_USE_UDL_TEMPLATE
// Passing user-defined literals directly to EXPECT_EQ causes problems // Passing user-defined literals directly to EXPECT_EQ causes problems
// with macro argument stringification (#) on some versions of GCC. // with macro argument stringification (#) on some versions of GCC.
// Workaround: Assing the UDL result to a variable before the macro. // Workaround: Assing the UDL result to a variable before the macro.
@ -128,7 +128,7 @@ TEST(LiteralsTest, Format) {
EXPECT_EQ(L"abc1", udl_format_w); EXPECT_EQ(L"abc1", udl_format_w);
} }
#endif // FMT_USE_USER_DEFINED_LITERALS #endif // FMT_USE_UDL_TEMPLATE
enum TestEnum { A }; enum TestEnum { A };