diff --git a/include/chaiscript/dispatchkit/bind_first.hpp b/include/chaiscript/dispatchkit/bind_first.hpp index c65c83858..3cf3fd33a 100644 --- a/include/chaiscript/dispatchkit/bind_first.hpp +++ b/include/chaiscript/dispatchkit/bind_first.hpp @@ -33,24 +33,24 @@ namespace chaiscript template auto bind_first(Ret (*f)(P1, Param...), O&& o) { - return [f, o](Param...param) -> Ret { - return f(std::forward(o), std::forward(param)...); + return [f, o = std::forward(o)](Param...param) -> Ret { + return f(o, std::forward(param)...); }; } template auto bind_first(Ret (Class::*f)(Param...), O&& o) { - return [f, o](Param...param) -> Ret { - return (get_pointer(o)->*f)(std::forward(param)...); + return [f, o = std::forward(o)](Param...param) -> Ret { + return (detail::get_pointer(o)->*f)(std::forward(param)...); }; } template auto bind_first(Ret (Class::*f)(Param...) const, O&& o) { - return [f, o](Param...param) -> Ret { - return (get_pointer(o)->*f)(std::forward(param)...); + return [f, o = std::forward(o)](Param...param) -> Ret { + return (detail::get_pointer(o)->*f)(std::forward(param)...); }; } @@ -58,7 +58,7 @@ namespace chaiscript template auto bind_first(const std::function &f, O&& o) { - return [f, o](Param...param) -> Ret { + return [f, o = std::forward(o)](Param...param) -> Ret { return f(o, std::forward(param)...); }; } @@ -66,7 +66,7 @@ namespace chaiscript template auto bind_first(const F &fo, O&& o, Ret (Class::*f)(P1, Param...) const) { - return [fo, o, f](Param ...param) -> Ret { + return [fo, o = std::forward(o), f](Param ...param) -> Ret { return (fo.*f)(o, std::forward(param)...); };