From 6854dea47ecefed75b8dadd0957995435149aec5 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 15 Dec 2020 12:46:04 +0100 Subject: [PATCH] delegate: use type_list rather than tuple internally --- src/entt/signal/delegate.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/entt/signal/delegate.hpp b/src/entt/signal/delegate.hpp index 3afe4ad83..3d83f26a1 100644 --- a/src/entt/signal/delegate.hpp +++ b/src/entt/signal/delegate.hpp @@ -100,7 +100,7 @@ class delegate { [[nodiscard]] auto wrap(std::index_sequence) ENTT_NOEXCEPT { return [](const void *, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); - return Ret(std::invoke(Candidate, std::forward>>(std::get(arguments))...)); + return Ret(std::invoke(Candidate, std::forward>>(std::get(arguments))...)); }; } @@ -109,7 +109,7 @@ class delegate { return [](const void *payload, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); Type *curr = static_cast(const_cast *>(payload)); - return Ret(std::invoke(Candidate, *curr, std::forward>>(std::get(arguments))...)); + return Ret(std::invoke(Candidate, *curr, std::forward>>(std::get(arguments))...)); }; } @@ -118,7 +118,7 @@ class delegate { return [](const void *payload, Args... args) -> Ret { [[maybe_unused]] const auto arguments = std::forward_as_tuple(std::forward(args)...); Type *curr = static_cast(const_cast *>(payload)); - return Ret(std::invoke(Candidate, curr, std::forward>>(std::get(arguments))...)); + return Ret(std::invoke(Candidate, curr, std::forward>>(std::get(arguments))...)); }; } @@ -180,7 +180,7 @@ public: return Ret(std::invoke(Candidate, std::forward(args)...)); }; } else if constexpr(std::is_member_pointer_v) { - fn = wrap(internal::index_sequence_for>>(internal::function_pointer_t{})); + fn = wrap(internal::index_sequence_for>>(internal::function_pointer_t{})); } else { fn = wrap(internal::index_sequence_for(internal::function_pointer_t{})); }