Merge pull request #390 from chronoxor/master
Introduced NamedArgWithType<Char, T> : NamedArg<Char>
diff --git a/fmt/format.h b/fmt/format.h
index bc64c02..ae7bd49 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -1052,6 +1052,8 @@
template <typename Char>
struct NamedArg;
+template <typename Char, typename T>
+struct NamedArgWithType;
template <typename T = void>
struct Null {};
@@ -1333,9 +1335,13 @@
// uses char.
template <typename Char_>
MakeValue(const NamedArg<Char_> &value) { pointer = &value; }
+ template <typename Char_, typename T>
+ MakeValue(const NamedArgWithType<Char_, T> &value) { pointer = &value; }
template <typename Char_>
static uint64_t type(const NamedArg<Char_> &) { return Arg::NAMED_ARG; }
+ template <typename Char_, typename T>
+ static uint64_t type(const NamedArgWithType<Char_, T> &) { return Arg::NAMED_ARG; }
};
template <typename Formatter>
@@ -1361,6 +1367,12 @@
: Arg(MakeArg< BasicFormatter<Char> >(value)), name(argname) {}
};
+template <typename Char, typename T>
+struct NamedArgWithType : NamedArg<Char> {
+ NamedArgWithType(BasicStringRef<Char> argname, const T &value)
+ : NamedArg<Char>(argname, value) {}
+};
+
class RuntimeError : public std::runtime_error {
protected:
RuntimeError() : std::runtime_error("") {}
@@ -3342,13 +3354,13 @@
\endrst
*/
template <typename T>
-inline internal::NamedArg<char> arg(StringRef name, const T &arg) {
- return internal::NamedArg<char>(name, arg);
+inline internal::NamedArgWithType<char, T> arg(StringRef name, const T &arg) {
+ return internal::NamedArgWithType<char, T>(name, arg);
}
template <typename T>
-inline internal::NamedArg<wchar_t> arg(WStringRef name, const T &arg) {
- return internal::NamedArg<wchar_t>(name, arg);
+inline internal::NamedArgWithType<wchar_t, T> arg(WStringRef name, const T &arg) {
+ return internal::NamedArgWithType<wchar_t, T>(name, arg);
}
// The following two functions are deleted intentionally to disable
@@ -3793,7 +3805,7 @@
const Char *str;
template <typename T>
- NamedArg<Char> operator=(T &&value) const {
+ NamedArgWithType<Char, T> operator=(T &&value) const {
return {str, std::forward<T>(value)};
}
};
