commit 624c58682d93a969f6372ea37efec7a3ca53d655
author Victor Zverovich <victor.zverovich@gmail.com> Sun Feb 05 06:41:39 2017 -0800
committer Victor Zverovich <victor.zverovich@gmail.com> Sun Feb 05 06:41:39 2017 -0800
tree 04d85a257ab872df1ab8d819235423a208d0c929
parent 7ae8bd7073043568c59524a28611516663a0aaf3

Simplify API

fmt/printf.h

diff --git a/fmt/printf.h b/fmt/printf.h
index 09ed776..2fa54d2 100644
--- a/fmt/printf.h
+++ b/fmt/printf.h
@@ -103,7 +103,7 @@
     bool is_signed = type_ == 'd' || type_ == 'i';
     typedef typename internal::Conditional<
         is_same<T, void>::value, U, T>::type TargetType;
-    typedef basic_format_context<Char> format_context;
+    typedef basic_context<Char> context;
     if (sizeof(TargetType) <= sizeof(int)) {
       // Extra casts are used to silence warnings.
       if (is_signed) {
@@ -287,8 +287,8 @@
   /** Formats an argument of a custom (user-defined) type. */
   void operator()(internal::CustomValue<Char> c) {
     const Char format_str[] = {'}', '\0'};
-    auto args = basic_args<basic_format_context<Char>>();
-    basic_format_context<Char> ctx(format_str, args);
+    auto args = basic_args<basic_context<Char>>();
+    basic_context<Char> ctx(format_str, args);
     c.format(this->writer(), c.value, &ctx);
   }
 };
@@ -297,14 +297,14 @@
 template <typename Char,
           typename ArgFormatter = PrintfArgFormatter<Char> >
 class printf_context :
-  private internal::format_context_base<
+  private internal::context_base<
     Char, printf_context<Char, ArgFormatter>> {
  public:
   /** The character type for the output. */
   typedef Char char_type;
 
  private:
-  typedef internal::format_context_base<Char, printf_context> Base;
+  typedef internal::context_base<Char, printf_context> Base;
   typedef typename Base::format_arg format_arg;
   typedef basic_format_specs<Char> format_specs;
 
@@ -539,7 +539,7 @@
 */
 template <typename... Args>
 inline std::string sprintf(CStringRef format_str, const Args & ... args) {
-  return vsprintf(format_str, make_xformat_args<printf_context<char>>(args...));
+  return vsprintf(format_str, make_args<printf_context<char>>(args...));
 }
 
 inline std::wstring vsprintf(
@@ -551,7 +551,7 @@
 
 template <typename... Args>
 inline std::wstring sprintf(WCStringRef format_str, const Args & ... args) {
-  auto vargs = make_xformat_args<printf_context<wchar_t>>(args...);
+  auto vargs = make_args<printf_context<wchar_t>>(args...);
   return vsprintf(format_str, vargs);
 }
 
@@ -568,7 +568,7 @@
  */
 template <typename... Args>
 inline int fprintf(std::FILE *f, CStringRef format_str, const Args & ... args) {
-  auto vargs = make_xformat_args<printf_context<char>>(args...);
+  auto vargs = make_args<printf_context<char>>(args...);
   return vfprintf(f, format_str, vargs);
 }
 
@@ -587,7 +587,7 @@
  */
 template <typename... Args>
 inline int printf(CStringRef format_str, const Args & ... args) {
-  return vprintf(format_str, make_xformat_args<printf_context<char>>(args...));
+  return vprintf(format_str, make_args<printf_context<char>>(args...));
 }
 
 inline int vfprintf(std::ostream &os, CStringRef format_str, printf_args args) {
@@ -609,7 +609,7 @@
 template <typename... Args>
 inline int fprintf(std::ostream &os, CStringRef format_str,
                    const Args & ... args) {
-  auto vargs = make_xformat_args<printf_context<char>>(args...);
+  auto vargs = make_args<printf_context<char>>(args...);
   return vfprintf(os, format_str, vargs);
 }
 }  // namespace fmt