implement perfect forwarding in embind

2 files changed, 16 insertions, 16 deletions

diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index 9b6e69c9..b17488b9 100755
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -723,14 +723,14 @@ namespace emscripten {
         {}
 
         template<typename ReturnType, typename... Args>
-        ReturnType call(const char* name, Args... args) const {
-            return Caller<ReturnType, Args...>::call(wrapped, name, args...);
+        ReturnType call(const char* name, Args&&... args) const {
+            return Caller<ReturnType, Args...>::call(wrapped, name, std::forward<Args>(args)...);
         }
 
         template<typename ReturnType, typename... Args, typename Default>
-        ReturnType optional_call(const char* name, Default def, Args... args) const {
+        ReturnType optional_call(const char* name, Default def, Args&&... args) const {
             if (has_function(name)) {
-                return Caller<ReturnType, Args...>::call(wrapped, name, args...);
+                return Caller<ReturnType, Args...>::call(wrapped, name, std::forward<Args>(args)...);
             } else {
                 return def();
             }
@@ -744,15 +744,15 @@ namespace emscripten {
         // this class only exists because you can't partially specialize function templates
         template<typename ReturnType, typename... Args>
         struct Caller {
-            static ReturnType call(const val& v, const char* name, Args... args) {
-                return v.call(name, args...).template as<ReturnType>();
+            static ReturnType call(const val& v, const char* name, Args&&... args) {
+                return v.call(name, std::forward<Args>(args)...).template as<ReturnType>();
             }
         };
 
         template<typename... Args>
         struct Caller<void, Args...> {
-            static void call(const val& v, const char* name, Args... args) {
-                v.call_void(name, args...);
+            static void call(const val& v, const char* name, Args&&... args) {
+                v.call_void(name, std::forward<Args>(args)...);
             }
         };
 
diff --git a/system/include/emscripten/val.h b/system/include/emscripten/val.h
index c27a0fdb..d32c9650 100644
--- a/system/include/emscripten/val.h
+++ b/system/include/emscripten/val.h
@@ -135,7 +135,7 @@ namespace emscripten {
         }
 
         template<typename... Args>
-        val new_(Args... args) const {
+        val new_(Args&&... args) const {
             using namespace internal;
 
             WithPolicies<>::ArgTypeList<Args...> argList;
@@ -152,7 +152,7 @@ namespace emscripten {
                     handle,
                     argList.count,
                     argList.types,
-                    toWireType(args)...));
+                    toWireType(std::forward<Args>(args))...));
         }
         
         template<typename T>
@@ -166,7 +166,7 @@ namespace emscripten {
         }
 
         template<typename... Args>
-        val operator()(Args... args) {
+        val operator()(Args&&... args) {
             using namespace internal;
 
             WithPolicies<>::ArgTypeList<Args...> argList;
@@ -181,11 +181,11 @@ namespace emscripten {
                     handle,
                     argList.count,
                     argList.types,
-                    toWireType(args)...));
+                    toWireType(std::forward<Args>(args))...));
         }
 
         template<typename ...Args>
-        val call(const char* name, Args... args) const {
+        val call(const char* name, Args&&... args) const {
             using namespace internal;
 
             WithPolicies<>::ArgTypeList<Args...> argList;
@@ -202,11 +202,11 @@ namespace emscripten {
                     name,
                     argList.count,
                     argList.types,
-                    toWireType(args)...));
+                    toWireType(std::forward<Args>(args))...));
         }
 
         template<typename ...Args>
-        void call_void(const char* name, Args... args) const {
+        void call_void(const char* name, Args&&... args) const {
             using namespace internal;
 
             WithPolicies<>::ArgTypeList<Args...> argList;
@@ -222,7 +222,7 @@ namespace emscripten {
                 name,
                 argList.count,
                 argList.types,
-                toWireType(args)...);
+                toWireType(std::forward<Args>(args))...);
         }
 
         bool has_function(const char* name) const {