Merge the master branch

2015-08-04 20:59:24 -07:00
parent 64eb3d8bb2
commit f6135df529
3 changed files with 22 additions and 19 deletions
@@ -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));
  }
 };