This commit is contained in:
gabime 2016-12-02 17:40:40 +02:00
parent 6d8efa8d7f
commit 5d23e88c16
4 changed files with 19 additions and 19 deletions

View File

@ -2647,15 +2647,15 @@ inline uint64_t make_type(const T &arg)
} }
template <unsigned N, bool/*IsPacked*/ = (N < ArgList::MAX_PACKED_ARGS)> template <unsigned N, bool/*IsPacked*/ = (N < ArgList::MAX_PACKED_ARGS)>
struct ArgArray; struct ArgArray;
template <unsigned N> template <unsigned N>
struct ArgArray<N, true/*IsPacked*/> struct ArgArray<N, true/*IsPacked*/>
{ {
typedef Value Type[N > 0 ? N : 1]; typedef Value Type[N > 0 ? N : 1];
template <typename Formatter, typename T> template <typename Formatter, typename T>
static Value make(const T &value) static Value make(const T &value)
{ {
#ifdef __clang__ #ifdef __clang__
Value result = MakeValue<Formatter>(value); Value result = MakeValue<Formatter>(value);
@ -2667,7 +2667,7 @@ static Value make(const T &value)
return MakeValue<Formatter>(value); return MakeValue<Formatter>(value);
#endif #endif
} }
}; };
template <unsigned N> template <unsigned N>
struct ArgArray<N, false/*IsPacked*/> struct ArgArray<N, false/*IsPacked*/>
@ -4571,7 +4571,7 @@ struct UdlArg
template <typename T> template <typename T>
NamedArgWithType<Char, T> operator=(T &&value) const NamedArgWithType<Char, T> operator=(T &&value) const
{ {
return{ str, std::forward<T>(value) }; return { str, std::forward<T>(value) };
} }
}; };
@ -4593,12 +4593,12 @@ std::string message = "The answer is {}"_format(42);
inline internal::UdlFormat<char> inline internal::UdlFormat<char>
operator"" _format(const char *s, std::size_t) operator"" _format(const char *s, std::size_t)
{ {
return{ s }; return { s };
} }
inline internal::UdlFormat<wchar_t> inline internal::UdlFormat<wchar_t>
operator"" _format(const wchar_t *s, std::size_t) operator"" _format(const wchar_t *s, std::size_t)
{ {
return{ s }; return { s };
} }
/** /**
@ -4614,12 +4614,12 @@ print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
inline internal::UdlArg<char> inline internal::UdlArg<char>
operator"" _a(const char *s, std::size_t) operator"" _a(const char *s, std::size_t)
{ {
return{ s }; return { s };
} }
inline internal::UdlArg<wchar_t> inline internal::UdlArg<wchar_t>
operator"" _a(const wchar_t *s, std::size_t) operator"" _a(const wchar_t *s, std::size_t)
{ {
return{ s }; return { s };
} }
} // inline namespace literals } // inline namespace literals