diff --git a/src/entt/signal/delegate.hpp b/src/entt/signal/delegate.hpp index 94d675226..2af110142 100644 --- a/src/entt/signal/delegate.hpp +++ b/src/entt/signal/delegate.hpp @@ -105,17 +105,18 @@ class delegate { template void connect(std::index_sequence) ENTT_NOEXCEPT { + static_assert(std::is_invocable_r_v>...>); data = nullptr; fn = [](const void *, std::tuple args) -> Ret { // Ret(...) makes void(...) eat the return values to avoid errors - static_assert(std::is_invocable_r_v>...>); return Ret(std::invoke(Function, std::forward>>(std::get(args))...)); }; } template void connect(Type *value_or_instance, std::index_sequence) ENTT_NOEXCEPT { + static_assert(std::is_invocable_r_v>...>); data = value_or_instance; fn = [](const void *payload, std::tuple args) -> Ret { @@ -128,7 +129,6 @@ class delegate { } // Ret(...) makes void(...) eat the return values to avoid errors - static_assert(std::is_invocable_r_v>...>); return Ret(std::invoke(Candidate, curr, std::forward>>(std::get(args))...)); }; }