Fix FunctionT not forwarding its varargs

The "name" paramter for a Routine supports format strings with varargs, but FunctionT did not correctly forward the args. Bug: b/174358505 Change-Id: Ib94f8b8b4f8a4424e8aa0db0a4e4f8a286f3de2e Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50788 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Antonio Maiorano <amaiorano@google.com>

Fix FunctionT not forwarding its varargs
9ff8066d · Antonio Maiorano · bfb21191 · 9ff8066d
Commit 9ff8066d authored Nov 27, 2020 by Antonio Maiorano
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

Reactor.hpp src/Reactor/Reactor.hpp +6 -4

No files found.
--- a/src/Reactor/Reactor.hpp
+++ b/src/Reactor/Reactor.hpp
@@ -2639,14 +2639,16 @@ public:

 	// Hide base implementations of operator()

-	RoutineType operator()(const char *name, ...)
+	template<typename... VarArgs>
+	RoutineType operator()(const char *name, VarArgs... varArgs)
 	{
-		return RoutineType(BaseType::operator()(name));
+		return RoutineType(BaseType::operator()(name, std::forward<VarArgs>(varArgs)...));
 	}

-	RoutineType operator()(const Config::Edit &cfg, const char *name, ...)
+	template<typename... VarArgs>
+	RoutineType operator()(const Config::Edit &cfg, const char *name, VarArgs... varArgs)
 	{
-		return RoutineType(BaseType::operator()(cfg, name));
+		return RoutineType(BaseType::operator()(cfg, name, std::forward<VarArgs>(varArgs)...));
 	}
 };