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

sigh:

Browse Source 
* fixed doc
* test review/cleanup
This commit is contained in:
Michele Caini
2022-03-04 11:16:25 +01:00
parent 039341de69
commit 52f77d61ba
2 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/entt/signal/sigh.hpp
View File

@@ -81,7 +81,7 @@ public:
: calls{allocator} {}
/**
* @brief Default copy constructor.
* @brief Copy constructor.
* @param other The instance to copy from.
*/
sigh(const sigh &other)
@@ -96,7 +96,7 @@ public:
: calls{other.calls, allocator} {}
/**
* @brief Default move constructor.
* @brief Move constructor.
* @param other The instance to move from.
*/
sigh(sigh &&other) ENTT_NOEXCEPT
@@ -111,7 +111,7 @@ public:
: calls{std::move(other.calls), allocator} {}
/**
* @brief Default copy assignment operator.
* @brief Copy assignment operator.
* @param other The instance to copy from.
* @return This signal handler.
*/
@@ -121,7 +121,7 @@ public:
}
/**
* @brief Default move assignment operator.
* @brief Move assignment operator.
* @param other The instance to move from.
* @return This signal handler.
*/

88
test/entt/signal/sigh.cpp
View File

@@ -531,53 +531,47 @@ TEST_F(SigH, UnboundMemberFunction) {
TEST_F(SigH, CustomAllocator) {
std::allocator<void (*)(int)> allocator;
auto test = [&](auto curr) {
ASSERT_EQ(curr.get_allocator(), allocator);
ASSERT_FALSE(curr.get_allocator() != allocator);
ASSERT_TRUE(curr.empty());
entt::sink sink{curr};
sigh_listener listener;
sink.template connect<&sigh_listener::g>(listener);
decltype(curr) copy{curr, allocator};
sink.disconnect(listener);
ASSERT_TRUE(curr.empty());
ASSERT_FALSE(copy.empty());
curr = copy;
ASSERT_FALSE(curr.empty());
ASSERT_FALSE(copy.empty());
decltype(curr) move{std::move(copy), allocator};
ASSERT_TRUE(copy.empty());
ASSERT_FALSE(move.empty());
sink = entt::sink{move};
sink.disconnect(&listener);
ASSERT_TRUE(copy.empty());
ASSERT_TRUE(move.empty());
sink.template connect<&sigh_listener::g>(listener);
copy.swap(move);
ASSERT_FALSE(copy.empty());
ASSERT_TRUE(move.empty());
sink = entt::sink{copy};
sink.disconnect();
ASSERT_TRUE(copy.empty());
ASSERT_TRUE(move.empty());
};
entt::sigh<void(int), decltype(allocator)> sigh{allocator};
test(sigh);
test(std::move(sigh));
ASSERT_EQ(sigh.get_allocator(), allocator);
ASSERT_FALSE(sigh.get_allocator() != allocator);
ASSERT_TRUE(sigh.empty());
entt::sink sink{sigh};
sigh_listener listener;
sink.template connect<&sigh_listener::g>(listener);
decltype(sigh) copy{sigh, allocator};
sink.disconnect(listener);
ASSERT_TRUE(sigh.empty());
ASSERT_FALSE(copy.empty());
sigh = copy;
ASSERT_FALSE(sigh.empty());
ASSERT_FALSE(copy.empty());
decltype(sigh) move{std::move(copy), allocator};
ASSERT_TRUE(copy.empty());
ASSERT_FALSE(move.empty());
sink = entt::sink{move};
sink.disconnect(&listener);
ASSERT_TRUE(copy.empty());
ASSERT_TRUE(move.empty());
sink.template connect<&sigh_listener::g>(listener);
copy.swap(move);
ASSERT_FALSE(copy.empty());
ASSERT_TRUE(move.empty());
sink = entt::sink{copy};
sink.disconnect();
ASSERT_TRUE(copy.empty());
ASSERT_TRUE(move.empty());
}