From ed6fe9e657cd2636b3931608c6be2c5f4e0a0380 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 27 Mar 2023 15:56:35 +0200 Subject: [PATCH] sigh/sink: refine internal definition --- src/entt/signal/sigh.hpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/entt/signal/sigh.hpp b/src/entt/signal/sigh.hpp index db2ed4a40..b68d29e32 100644 --- a/src/entt/signal/sigh.hpp +++ b/src/entt/signal/sigh.hpp @@ -56,7 +56,8 @@ class sigh { friend class sink>; using alloc_traits = std::allocator_traits; - using container_type = std::vector, typename alloc_traits::template rebind_alloc>>; + using delegate_type = delegate; + using container_type = std::vector>; public: /*! @brief Allocator type. */ @@ -358,6 +359,7 @@ private: template class sink> { using signal_type = sigh; + using delegate_type = typename signal_type::delegate_type; using difference_type = typename signal_type::container_type::difference_type; template @@ -370,7 +372,7 @@ class sink> { sink{*static_cast(signal)}.disconnect(); } - auto before(delegate call) { + auto before(delegate_type call) { const auto &calls = signal->calls; const auto it = std::find(calls.cbegin(), calls.cend(), std::move(call)); @@ -404,7 +406,7 @@ public: */ template [[nodiscard]] sink before() { - delegate call{}; + delegate_type call{}; call.template connect(); return before(std::move(call)); } @@ -419,7 +421,7 @@ public: */ template [[nodiscard]] sink before(Type &&value_or_instance) { - delegate call{}; + delegate_type call{}; call.template connect(value_or_instance); return before(std::move(call)); } @@ -479,7 +481,7 @@ public: connection connect(Type &&...value_or_instance) { disconnect(value_or_instance...); - delegate call{}; + delegate_type call{}; call.template connect(value_or_instance...); signal->calls.insert(signal->calls.end() - offset, std::move(call)); @@ -498,7 +500,7 @@ public: template void disconnect(Type &&...value_or_instance) { auto &calls = signal->calls; - delegate call{}; + delegate_type call{}; call.template connect(value_or_instance...); calls.erase(std::remove(calls.begin(), calls.end(), std::move(call)), calls.end()); }