X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Fformat.h;h=7bd8264f2407495d4c306501e6979703eb4740e5;hp=6d8f739a436c3abaa8fdbbbdc7292e5dfb803d1d;hb=4e8408b966dfe65d971237c72a892f4720d885b1;hpb=1f0843257065789231a9949e0a81b79afd7bbebe

diff --git a/source/strings/format.h b/source/strings/format.h
index 6d8f739..7bd8264 100644
--- a/source/strings/format.h
+++ b/source/strings/format.h
@@ -24,11 +24,19 @@ public:
 	template<typename T>
 	Formatter &operator()(const T &a)
 	{
-		result += lexical_cast(a, get_conversion());
+		result += lexical_cast<std::string>(a, get_conversion());
 		advance();
 		return *this;
 	}
 
+#if __cplusplus>=201103L
+	template<typename T, typename... Tail>
+	Formatter &operator()(const T &a, const Tail &... tail)
+	{
+		return (*this)(a)(tail...);
+	}
+#endif
+
 	/** Returns the result of the formatting operation.  Will throw if not
 	enough values have been fed to the formatter. */
 	const std::string &str() const;
@@ -47,6 +55,14 @@ private:
 inline Formatter format(const std::string &f)
 { return Formatter(f); }
 
+#if __cplusplus >= 201103L
+template<typename... Args>
+inline std::string format(const std::string &f, const Args &... args)
+{
+	return Formatter(f)(args...).str();
+}
+
+#else
 template<typename A1>
 inline std::string format(const std::string &f, const A1 &a1)
 { return Formatter(f)(a1).str(); }
@@ -66,6 +82,7 @@ inline std::string format(const std::string &f, const A1 &a1, const A2 &a2, cons
 template<typename A1, typename A2, typename A3, typename A4, typename A5>
 inline std::string format(const std::string &f, const A1 &a1, const A2 &a2, const A3 &a3, const A4 &a4, const A5 &a5)
 { return Formatter(f)(a1)(a2)(a3)(a4)(a5).str(); }
+#endif
 
 } // namespace Msp