Revert "Fix perfect forwarding"

This reverts commit e4a568f.

Author: rhaschke

include/pybind11/detail/init.h

@@ -234,7 +234,7 @@ struct factory<Func, void_type (*)(), Return(Args...)> {
         auto &func = class_factory;
         cl.def("__init__", [func]
         #endif
-        (value_and_holder &v_h, Args&&... args) {
+        (value_and_holder &v_h, Args... args) {
             construct<Class>(v_h, func(std::forward<Args>(args)...),
                              Py_TYPE(v_h.inst) != v_h.type->type);
         }, is_new_style_constructor(), extra...);
@@ -324,7 +324,7 @@ struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> {
         auto &func = set;
         cl.def("__setstate__", [func]
 #endif
-        (value_and_holder &v_h, ArgState&& state) {
+        (value_and_holder &v_h, ArgState state) {
             setstate<Class>(v_h, func(std::forward<ArgState>(state)),
                             Py_TYPE(v_h.inst) != v_h.type->type);
         }, is_new_style_constructor(), extra...);

include/pybind11/functional.h

@@ -72,7 +72,7 @@ struct type_caster<std::function<Return(Args...)>> {
         struct func_wrapper {
             func_handle hfunc;
             func_wrapper(func_handle&& hf): hfunc(std::move(hf)) {}
-            Return operator()(Args&&... args) const {
+            Return operator()(Args... args) const {
                 gil_scoped_acquire acq;
                 object retval(hfunc.f(std::forward<Args>(args)...));
                 /* Visual studio 2015 parser issue: need parentheses around this expression */

include/pybind11/pybind11.h

@@ -90,7 +90,7 @@ class cpp_function : public function {
     /// but with an added `&`.
     template <typename Return, typename Class, typename... Arg, typename... Extra>
     cpp_function(Return (Class::*f)(Arg...)&, const Extra&... extra) {
-        initialize([f](Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
+        initialize([f](Class *c, Arg... args) -> Return { return (c->*f)(args...); },
                    (Return (*) (Class *, Arg...)) nullptr, extra...);
     }
 
@@ -106,7 +106,7 @@ class cpp_function : public function {
     /// but with an added `&`.
     template <typename Return, typename Class, typename... Arg, typename... Extra>
     cpp_function(Return (Class::*f)(Arg...) const&, const Extra&... extra) {
-        initialize([f](const Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
+        initialize([f](const Class *c, Arg... args) -> Return { return (c->*f)(args...); },
                    (Return (*)(const Class *, Arg ...)) nullptr, extra...);
     }
 

tests/test_copy_move.py

@@ -64,9 +64,9 @@ def test_move_and_copy_loads():
     assert c_m.move_assignments == 6
     assert c_m.move_constructions == 9
     assert c_mc.copy_assignments == 0
-    assert c_mc.copy_constructions == 1
+    assert c_mc.copy_constructions == 5
     assert c_mc.move_assignments == 6
-    assert c_mc.move_constructions == 8
+    assert c_mc.move_constructions == 4
     assert c_c.copy_assignments == 4
     assert c_c.copy_constructions == 6
     assert c_m.alive() + c_mc.alive() + c_c.alive() == 0