Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delegate: renaming of exported types

Browse Source
This commit is contained in:
Michele Caini
2020-06-03 23:59:58 +02:00
parent 7d786cea8f
commit 748ab221dd
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/entt/signal/delegate.hpp
View File

@@ -122,10 +122,10 @@ class delegate<Ret(Args...)> {
}
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;
};

30
test/entt/signal/delegate.cpp
View File

@@ -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<typename decltype(func)::function_type, int(const int &)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_ref)::function_type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_const_ref)::function_type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_ptr)::function_type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_const_ptr)::function_type, int(int)>);
static_assert(std::is_same_v<typename decltype(member_func_f)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_g)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_h)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_h_const)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_i)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_i_const)::function_type, void()>);
static_assert(std::is_same_v<typename decltype(data_member_u)::function_type, int()>);
static_assert(std::is_same_v<typename decltype(data_member_v)::function_type, const int()>);
static_assert(std::is_same_v<typename decltype(data_member_v_const)::function_type, const int()>);
static_assert(std::is_same_v<typename decltype(lambda)::function_type, int(int)>);
static_assert(std::is_same_v<typename decltype(func)::type, int(const int &)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_ref)::type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_const_ref)::type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_ptr)::type, int(int)>);
static_assert(std::is_same_v<typename decltype(curried_func_with_const_ptr)::type, int(int)>);
static_assert(std::is_same_v<typename decltype(member_func_f)::type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_g)::type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_h)::type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_h_const)::type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_i)::type, void()>);
static_assert(std::is_same_v<typename decltype(member_func_i_const)::type, void()>);
static_assert(std::is_same_v<typename decltype(data_member_u)::type, int()>);
static_assert(std::is_same_v<typename decltype(data_member_v)::type, const int()>);
static_assert(std::is_same_v<typename decltype(data_member_v_const)::type, const int()>);
static_assert(std::is_same_v<typename decltype(lambda)::type, int(int)>);
ASSERT_TRUE(func);
ASSERT_TRUE(curried_func_with_ref);