From f6135df529c165647577913bc2272000f4e953cf Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Tue, 4 Aug 2015 20:59:24 -0700
Subject: [PATCH] Merge the master branch

---
 CMakeLists.txt | 11 +++++++----
 format.cc      | 26 +++++++++++++-------------
 format.h       |  4 ++--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b48b183a..96dd8416 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,9 +95,9 @@ if (BUILD_SHARED_LIBS)
   # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6.
   target_link_libraries(cppformat -Wl,--as-needed)
 endif ()
-if (FMT_PEDANTIC AND CMAKE_COMPILER_IS_GNUCXX)
-  set_target_properties(cppformat PROPERTIES COMPILE_FLAGS
-    "-Wall -Wextra -Wshadow -pedantic")
+if (FMT_PEDANTIC AND
+    (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
+  set(FMT_EXTRA_COMPILE_FLAGS "-Wall -Wextra -Wshadow -pedantic")
 endif ()
 
 # If FMT_PEDANTIC is TRUE, then test compilation with both -std=c++11
@@ -105,12 +105,15 @@ endif ()
 # The library is distributed in the source form and users have full control
 # over compile options, so the options used here only matter for testing.
 if (CPP11_FLAG AND FMT_PEDANTIC)
-  set_target_properties(cppformat PROPERTIES COMPILE_FLAGS ${CPP11_FLAG})
+  set(FMT_EXTRA_COMPILE_FLAGS "${FMT_EXTRA_COMPILE_FLAGS} ${CPP11_FLAG}")
   # Test compilation with default flags.
   file(GLOB src RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/*.cc test/*.h)
   add_library(testformat STATIC ${FMT_SOURCE_FILES} ${src})
 endif ()
 
+set_target_properties(cppformat
+  PROPERTIES COMPILE_FLAGS "${FMT_EXTRA_COMPILE_FLAGS}")
+
 add_subdirectory(doc)
 
 include_directories(. gmock)
diff --git a/format.cc b/format.cc
index 6dd52b87..666f69c2 100644
--- a/format.cc
+++ b/format.cc
@@ -205,8 +205,8 @@ int safe_strerror(
     }
 
    public:
-    StrError(int error_code, char *&buffer, std::size_t buffer_size)
-      : error_code_(error_code), buffer_(buffer), buffer_size_(buffer_size) {}
+    StrError(int err_code, char *&buf, std::size_t buf_size)
+      : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
 
     int run() {
       strerror_r(0, 0, "");  // Suppress a warning about unused strerror_r.
@@ -503,23 +503,23 @@ class PrintfArgFormatter :
   : BasicArgFormatter<PrintfArgFormatter<Char>, Char>(w, s) {}
 
   void visit_char(int value) {
-    const FormatSpec &spec = this->spec();
-    BasicWriter<Char> &writer = this->writer();
-    if (spec.type_ && spec.type_ != 'c')
-      writer.write_int(value, spec);
+    const FormatSpec &fmt_spec = this->spec();
+    BasicWriter<Char> &w = this->writer();
+    if (fmt_spec.type_ && fmt_spec.type_ != 'c')
+      w.write_int(value, fmt_spec);
     typedef typename BasicWriter<Char>::CharPtr CharPtr;
     CharPtr out = CharPtr();
-    if (spec.width_ > 1) {
+    if (fmt_spec.width_ > 1) {
       Char fill = ' ';
-      out = writer.grow_buffer(spec.width_);
-      if (spec.align_ != ALIGN_LEFT) {
-        std::fill_n(out, spec.width_ - 1, fill);
-        out += spec.width_ - 1;
+      out = w.grow_buffer(fmt_spec.width_);
+      if (fmt_spec.align_ != ALIGN_LEFT) {
+        std::fill_n(out, fmt_spec.width_ - 1, fill);
+        out += fmt_spec.width_ - 1;
       } else {
-        std::fill_n(out + 1, spec.width_ - 1, fill);
+        std::fill_n(out + 1, fmt_spec.width_ - 1, fill);
       }
     } else {
-      out = writer.grow_buffer(1);
+      out = w.grow_buffer(1);
     }
     *out = static_cast<Char>(value);
   }
diff --git a/format.h b/format.h
index 2a985f16..d384cfef 100644
--- a/format.h
+++ b/format.h
@@ -1046,8 +1046,8 @@ struct NamedArg : Arg {
   BasicStringRef<Char> name;
 
   template <typename T>
-  NamedArg(BasicStringRef<Char> name, const T &value)
-  : name(name), Arg(MakeValue<Char>(value)) {
+  NamedArg(BasicStringRef<Char> argname, const T &value)
+  : name(argname), Arg(MakeValue<Char>(value)) {
     type = static_cast<internal::Arg::Type>(MakeValue<Char>::type(value));
   }
 };