fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix more compilation errors on gcc 4.6

Browse Source
This commit is contained in:
Victor Zverovich
2018-02-28 05:23:25 -08:00
parent 1b4525384b
commit 81074c7048
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/format-test.cc
View File

@ -1251,7 +1251,7 @@ struct formatter<Date> {
return it; return it;
} }
auto format(const Date &d, context &ctx) { auto format(const Date &d, context &ctx) -> decltype(ctx.begin()) {
format_to(ctx.begin(), "{}-{}-{}", d.year(), d.month(), d.day()); format_to(ctx.begin(), "{}-{}-{}", d.year(), d.month(), d.day());
return ctx.begin(); return ctx.begin();
} }
@ -1269,7 +1269,7 @@ class Answer {};
namespace fmt { namespace fmt {
template <> template <>
struct formatter<Answer> : formatter<int> { struct formatter<Answer> : formatter<int> {
auto format(Answer, fmt::context &ctx) { auto format(Answer, fmt::context &ctx) -> decltype(ctx.begin()) {
return formatter<int>::format(42, ctx); return formatter<int>::format(42, ctx);
} }
}; };
@ -1527,6 +1527,12 @@ TEST(LiteralsTest, NamedArg) {
fmt::arg(L"third", 99)), fmt::arg(L"third", 99)),
udl_a_w); udl_a_w);
} }
TEST(FormatTest, UdlTemplate) {
EXPECT_EQ("foo", "foo"_format());
EXPECT_EQ(" 42", "{0:10}"_format(42));
EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42));
}
#endif // FMT_USE_USER_DEFINED_LITERALS #endif // FMT_USE_USER_DEFINED_LITERALS
enum TestEnum { A }; enum TestEnum { A };
@ -1594,7 +1600,7 @@ struct variant {
namespace fmt { namespace fmt {
template <> template <>
struct formatter<variant> : dynamic_formatter<> { struct formatter<variant> : dynamic_formatter<> {
auto format(variant value, context& ctx) { auto format(variant value, context& ctx) -> decltype(ctx.begin()) {
if (value.type == variant::INT) if (value.type == variant::INT)
return dynamic_formatter::format(42, ctx); return dynamic_formatter::format(42, ctx);
return dynamic_formatter::format("foo", ctx); return dynamic_formatter::format("foo", ctx);
@ -1628,12 +1634,6 @@ TEST(FormatTest, DynamicFormatter) {
format_error, "precision not allowed for this argument type"); format_error, "precision not allowed for this argument type");
} }
TEST(FormatTest, UdlTemplate) {
EXPECT_EQ("foo", "foo"_format());
EXPECT_EQ(" 42", "{0:10}"_format(42));
EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42));
}
TEST(FormatTest, ToString) { TEST(FormatTest, ToString) {
EXPECT_EQ("42", fmt::to_string(42)); EXPECT_EQ("42", fmt::to_string(42));
EXPECT_EQ("0x1234", fmt::to_string(reinterpret_cast<void*>(0x1234))); EXPECT_EQ("0x1234", fmt::to_string(reinterpret_cast<void*>(0x1234)));