From a1dd524b6fc0c5c0a3cce56609bcba9ec9cbc955 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Mon, 7 Nov 2016 18:22:21 -0800
Subject: [PATCH] format_arg -> do_format_arg

---
 fmt/format.h  | 6 +++---
 fmt/ostream.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fmt/format.h b/fmt/format.h
index 0c038a53..30d4c386 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -3446,8 +3446,8 @@ inline format_arg basic_format_context<Char>::parse_arg_id() {
 
 // Formats a single argument.
 template <typename ArgFormatter, typename Char, typename Context>
-void format_arg(BasicWriter<Char> &writer, const internal::Arg &arg,
-                Context &ctx) {
+void do_format_arg(BasicWriter<Char> &writer, const internal::Arg &arg,
+                   Context &ctx) {
   using internal::Arg;
   const Char *&s = ctx.ptr();
   FormatSpec spec;
@@ -3630,7 +3630,7 @@ void vformat(BasicWriter<Char> &writer, BasicCStringRef<Char> format_str,
     if (c == '}')
       FMT_THROW(format_error("unmatched '}' in format string"));
     internal::write(writer, start, s - 1);
-    format_arg<ArgFormatter>(writer, ctx.parse_arg_id(), ctx);
+    do_format_arg<ArgFormatter>(writer, ctx.parse_arg_id(), ctx);
     if (*s != '}')
       FMT_THROW(format_error(fmt::format("unknown format specifier")));
     start = ++s;
diff --git a/fmt/ostream.h b/fmt/ostream.h
index 920d041f..c623b542 100644
--- a/fmt/ostream.h
+++ b/fmt/ostream.h
@@ -88,7 +88,7 @@ void format_value(BasicWriter<Char> &w, const T &value,
   internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
   auto str = internal::format_value(buffer, value);
   typedef internal::MakeArg< basic_format_context<Char> > MakeArg;
-  format_arg< ArgFormatter<Char> >(w, MakeArg(str), ctx);
+  do_format_arg< ArgFormatter<Char> >(w, MakeArg(str), ctx);
 }
 
 FMT_API void vprint(std::ostream &os, CStringRef format_str, format_args args);