Pass universal references in Connection::callApi<>; fixed a typo in util.h

So that even uncopyable types could be used for parameters; also fixed a typo in util.h that prevented dispatch() from using with multiple argument functions.

2 files changed, 3 insertions, 3 deletions

diff --git a/connection.h b/connection.h
index 213bf26f..dbb50b9a 100644
--- a/connection.h
+++ b/connection.h
@@ -144,9 +144,9 @@ namespace QMatrixClient
              * argument - callApi() will pass it automatically.
              */
             template <typename JobT, typename... JobArgTs>
-            JobT* callApi(JobArgTs... jobArgs) const
+            JobT* callApi(JobArgTs&&... jobArgs) const
             {
-                auto job = new JobT(jobArgs...);
+                auto job = new JobT(std::forward<JobArgTs>(jobArgs)...);
                 job->start(connectionData());
                 return job;
             }
diff --git a/util.h b/util.h
index 1f9e3f0b..0c8f3640 100644
--- a/util.h
+++ b/util.h
@@ -231,7 +231,7 @@ namespace QMatrixClient
     template <typename ResultT, typename... ArgTs>
     Dispatch<ResultT, ArgTs...> dispatch(ArgTs&& ... args)
     {
-        return Dispatch<ResultT, ArgTs...>(std::forward<ArgTs...>(args)...);
+        return Dispatch<ResultT, ArgTs...>(std::forward<ArgTs>(args)...);
     }
 
     // The below enables pretty-printing of enums in logs