Convert repetitive functions to use C++11 variadic templates.

1 files changed, 6 insertions, 90 deletions

diff --git a/include/users.h b/include/users.h
index 4b3503fb4..4da167ac4 100644
--- a/include/users.h
+++ b/include/users.h
@@ -510,105 +510,21 @@ class CoreExport User : public Extensible
 
 	virtual void WriteRemoteNumeric(const Numeric::Numeric& numeric);
 
-	template <typename T1>
-	void WriteRemoteNumeric(unsigned int numeric, T1 p1)
+	template <typename... Param>
+	void WriteRemoteNumeric(unsigned int numeric, Param... p)
 	{
 		Numeric::Numeric n(numeric);
-		n.push(p1);
-		WriteRemoteNumeric(n);
-	}
-
-	template <typename T1, typename T2>
-	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		WriteRemoteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3>
-	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		WriteRemoteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3, typename T4>
-	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		n.push(p4);
-		WriteRemoteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3, typename T4, typename T5>
-	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		n.push(p4);
-		n.push(p5);
+		n.push(std::forward<Param>(p)...);
 		WriteRemoteNumeric(n);
 	}
 
 	void WriteNumeric(const Numeric::Numeric& numeric);
 
-	template <typename T1>
-	void WriteNumeric(unsigned int numeric, T1 p1)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		WriteNumeric(n);
-	}
-
-	template <typename T1, typename T2>
-	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		WriteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3>
-	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		WriteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3, typename T4>
-	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4)
-	{
-		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		n.push(p4);
-		WriteNumeric(n);
-	}
-
-	template <typename T1, typename T2, typename T3, typename T4, typename T5>
-	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
+	template <typename... Param>
+	void WriteNumeric(unsigned int numeric, Param... p)
 	{
 		Numeric::Numeric n(numeric);
-		n.push(p1);
-		n.push(p2);
-		n.push(p3);
-		n.push(p4);
-		n.push(p5);
+		n.push(std::forward<Param>(p)...);
 		WriteNumeric(n);
 	}