X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fprint.h;h=85fd539ddc51f702cf2720a949e1bb4a0efd4dde;hb=f7087c847a03a2bb4e9392e41eac4cb1ec37172c;hp=65744cbf69368b6da18cc37cd82dec2231ecee4c;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

diff --git a/source/io/print.h b/source/io/print.h
index 65744cb..85fd539 100644
--- a/source/io/print.h
+++ b/source/io/print.h
@@ -1,7 +1,7 @@
 #ifndef MSP_IO_PRINT_H_
 #define MSP_IO_PRINT_H_
 
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "base.h"
 #include "console.h"
 
@@ -15,50 +15,18 @@ completeness with the other print functions.
 inline unsigned print(Base &o, const std::string &f)
 { return o.write(f); }
 
-template<typename A1>
-inline unsigned print(Base &o, const std::string &f, A1 a1)
-{ return print(o, format(f, a1)); }
-
-template<typename A1, typename A2>
-inline unsigned print(Base &o, const std::string &f, A1 a1, A2 a2)
-{ return print(o, format(f, a1, a2)); }
-
-template<typename A1, typename A2, typename A3>
-inline unsigned print(Base &o, const std::string &f, A1 a1, A2 a2, A3 a3)
-{ return print(o, format(f, a1, a2, a3)); }
-
-template<typename A1, typename A2, typename A3, typename A4>
-inline unsigned print(Base &o, const std::string &f, A1 a1, A2 a2, A3 a3, A4 a4)
-{ return print(o, format(f, a1, a2, a3, a4)); }
-
-template<typename A1, typename A2, typename A3, typename A4, typename A5>
-inline unsigned print(Base &o, const std::string &f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{ return print(o, format(f, a1, a2, a3, a4, a5)); }
+template<typename... Args>
+inline unsigned print(Base &o, const std::string &f, Args... args)
+{ return print(o, format(f, args...)); }
 
 /* The following functions print to console */
 
 inline unsigned print(const std::string &f)
 { return print(cout, f); }
 
-template<typename A1>
-inline unsigned print(const std::string &f, A1 a1)
-{ return print(cout, f, a1); }
-
-template<typename A1, typename A2>
-inline unsigned print(const std::string &f, A1 a1, A2 a2)
-{ return print(cout, f, a1, a2); }
-
-template<typename A1, typename A2, typename A3>
-inline unsigned print(const std::string &f, A1 a1, A2 a2, A3 a3)
-{ return print(cout, f, a1, a2, a3); }
-
-template<typename A1, typename A2, typename A3, typename A4>
-inline unsigned print(const std::string &f, A1 a1, A2 a2, A3 a3, A4 a4)
-{ return print(cout, f, a1, a2, a3, a4); }
-
-template<typename A1, typename A2, typename A3, typename A4, typename A5>
-inline unsigned print(const std::string &f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5)
-{ return print(cout, f, a1, a2, a3, a4, a5); }
+template<typename... Args>
+inline unsigned print(const std::string &f, Args... args)
+{ return print(cout, f, args...); }
 
 } // namespace IO
 } // namespace Msp