diff --git a/src/entt/signal/delegate.hpp b/src/entt/signal/delegate.hpp index b8aec105b..395330291 100644 --- a/src/entt/signal/delegate.hpp +++ b/src/entt/signal/delegate.hpp @@ -122,10 +122,10 @@ class delegate { } public: - /*! @brief Function type of the expected target. */ - using target_type = Ret(const void *, Args...); + /*! @brief Function type of the contained target. */ + using function_type = Ret(const void *, Args...); /*! @brief Function type of the delegate. */ - using function_type = Ret(Args...); + using type = Ret(Args...); /*! @brief Return type of the delegate. */ using result_type = Ret; @@ -166,7 +166,7 @@ public: * @param function Function to connect to the delegate. * @param payload User defined arbitrary data. */ - delegate(target_type *function, const void *payload = nullptr) ENTT_NOEXCEPT + delegate(function_type *function, const void *payload = nullptr) ENTT_NOEXCEPT : delegate{} { connect(function, payload); @@ -257,7 +257,7 @@ public: * @param function Function to connect to the delegate. * @param payload User defined arbitrary data. */ - void connect(target_type *function, const void *payload = nullptr) ENTT_NOEXCEPT { + void connect(function_type *function, const void *payload = nullptr) ENTT_NOEXCEPT { fn = function; data = payload; } @@ -318,7 +318,7 @@ public: } private: - target_type *fn; + function_type *fn; const void *data; }; diff --git a/test/entt/signal/delegate.cpp b/test/entt/signal/delegate.cpp index f0e806a56..6ecde0541 100644 --- a/test/entt/signal/delegate.cpp +++ b/test/entt/signal/delegate.cpp @@ -249,21 +249,21 @@ TEST(Delegate, DeductionGuide) { entt::delegate data_member_v_const{entt::connect_arg<&const_nonconst_noexcept::v>, &std::as_const(functor)}; entt::delegate lambda{+[](const void *, int) { return 0; }}; - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); - static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); + static_assert(std::is_same_v); ASSERT_TRUE(func); ASSERT_TRUE(curried_func_with_ref);