diff --git a/fmt/format.h b/fmt/format.h index b0b1bc81..533678ea 100644 --- a/fmt/format.h +++ b/fmt/format.h @@ -1154,7 +1154,7 @@ inline fmt::StringRef thousands_sep(...) { return ""; } #endif template -void format_arg(Formatter &, const Char *, const T &) { +void format_value(Formatter &, const Char *, const T &) { FMT_STATIC_ASSERT(False::value, "Cannot format argument. To enable the use of ostream " "operator<< include fmt/ostream.h. Otherwise provide " @@ -1266,9 +1266,9 @@ class MakeValue : public Arg { template static void format_custom_arg( void *formatter, const void *arg, void *format_str_ptr) { - format_arg(*static_cast(formatter), - *static_cast(format_str_ptr), - *static_cast(arg)); + format_value(*static_cast(formatter), + *static_cast(format_str_ptr), + *static_cast(arg)); } public: diff --git a/fmt/ostream.h b/fmt/ostream.h index 259bc3e1..87b80471 100644 --- a/fmt/ostream.h +++ b/fmt/ostream.h @@ -73,7 +73,7 @@ void write(std::ostream &os, Writer &w); // Formats a value. template -void format_arg(BasicFormatter &f, +void format_value(BasicFormatter &f, const Char *&format_str, const T &value) { internal::MemoryBuffer buffer; diff --git a/fmt/time.h b/fmt/time.h index 83f742c4..675ff0da 100644 --- a/fmt/time.h +++ b/fmt/time.h @@ -15,7 +15,7 @@ namespace fmt { template -void format_arg(BasicFormatter &f, +void format_value(BasicFormatter &f, const char *&format_str, const std::tm &tm) { if (*format_str == ':') ++format_str; diff --git a/test/format-test.cc b/test/format-test.cc index 8a8df1a5..022b1aa7 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -1355,7 +1355,7 @@ TEST(FormatterTest, FormatCStringRef) { EXPECT_EQ("test", format("{0}", CStringRef("test"))); } -void format_arg(fmt::BasicFormatter &f, const char *, const Date &d) { +void format_value(fmt::BasicFormatter &f, const char *, const Date &d) { f.writer() << d.year() << '-' << d.month() << '-' << d.day(); } @@ -1368,7 +1368,7 @@ TEST(FormatterTest, FormatCustom) { class Answer {}; template -void format_arg(fmt::BasicFormatter &f, const Char *, Answer) { +void format_value(fmt::BasicFormatter &f, const Char *, Answer) { f.writer() << "42"; } diff --git a/test/util-test.cc b/test/util-test.cc index 6c1a2c0d..5d5ddf32 100644 --- a/test/util-test.cc +++ b/test/util-test.cc @@ -64,7 +64,7 @@ namespace { struct Test {}; template -void format_arg(fmt::BasicFormatter &f, const Char *, Test) { +void format_value(fmt::BasicFormatter &f, const Char *, Test) { f.writer() << "test"; } @@ -581,7 +581,7 @@ struct CustomFormatter { typedef char Char; }; -void format_arg(CustomFormatter &, const char *&s, const Test &) { +void format_value(CustomFormatter &, const char *&s, const Test &) { s = "custom_format"; }