diff --git a/include/Continuable.h b/include/Continuable.h index 61d974f..ae8abc2 100644 --- a/include/Continuable.h +++ b/include/Continuable.h @@ -45,7 +45,7 @@ namespace detail static auto create() -> Callback { - return [](Args...) + return [](Args&&...) { }; } diff --git a/include/functional_unwrap.hpp b/include/functional_unwrap.hpp index ff0e5c3..ff99fb4 100644 --- a/include/functional_unwrap.hpp +++ b/include/functional_unwrap.hpp @@ -212,7 +212,7 @@ namespace fu namespace detail { - /// Implementation of invoke_with_tuple + /// Implementation of invoke_from_tuple template struct invoker; @@ -230,7 +230,7 @@ namespace fu /// Invokes a function type with the given tuple arguments. template - inline auto invoke_with_tuple(_FTy&& functional, _TTy&& tuple) + inline auto invoke_from_tuple(_FTy&& functional, _TTy&& tuple) -> return_type_of_t::type> { return detail::invoker< diff --git a/test.cpp b/test.cpp index 9feea1c..42a36b9 100644 --- a/test.cpp +++ b/test.cpp @@ -332,7 +332,7 @@ int main(int /*argc*/, char** /*argv*/) return 1; }; - fu::invoke_with_tuple(lam, std::move(myargs)); + fu::invoke_from_tuple(lam, std::move(myargs)); fu::sequence_generator<2>::type seqtype; fu::sequence_generator<1>::type zero_seqtype;