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

sigh: internal changes

Browse Source
This commit is contained in:
Michele Caini
2024-06-21 11:37:04 +02:00
parent b7c3cb267c
commit 3927ddeb58
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,9 +440,8 @@ public:
* @param value_or_instance A valid object that fits the purpose.
*/
void disconnect(const void *value_or_instance) {
if(value_or_instance) {
disconnect_if([value_or_instance](const auto &elem) { return elem.data() == value_or_instance; });
}
ENTT_ASSERT(value_or_instance != nullptr, "Invalid value or instance");
disconnect_if([value_or_instance](const auto &elem) { return elem.data() == value_or_instance; });
}
/*! @brief Disconnects all the listeners from a signal. */

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

@@ -70,7 +70,8 @@ TEST(SigH, Lifetime) {
ASSERT_NO_THROW(delete new signal{});
}
TEST(SigH, Clear) {
TEST(SigH, Disconnect) {
sigh_listener listener;
entt::sigh<void(int &)> sigh;
entt::sink sink{sigh};
@@ -79,7 +80,32 @@ TEST(SigH, Clear) {
ASSERT_FALSE(sink.empty());
ASSERT_FALSE(sigh.empty());
sink.disconnect(static_cast<const void *>(nullptr));
sink.disconnect<&sigh_listener::f>();
ASSERT_TRUE(sink.empty());
ASSERT_TRUE(sigh.empty());
sink.connect<&sigh_listener::g>(listener);
ASSERT_FALSE(sink.empty());
ASSERT_FALSE(sigh.empty());
sink.disconnect<&sigh_listener::g>(listener);
ASSERT_TRUE(sink.empty());
ASSERT_TRUE(sigh.empty());
sink.connect<&sigh_listener::g>(listener);
ASSERT_FALSE(sink.empty());
ASSERT_FALSE(sigh.empty());
sink.disconnect(&listener);
ASSERT_TRUE(sink.empty());
ASSERT_TRUE(sigh.empty());
sink.connect<&sigh_listener::f>();
ASSERT_FALSE(sink.empty());
ASSERT_FALSE(sigh.empty());
@@ -186,11 +212,6 @@ TEST(SigH, Members) {
ASSERT_FALSE(sigh.empty());
ASSERT_EQ(sigh.size(), 2u);
sink.disconnect(static_cast<const void *>(nullptr));
ASSERT_FALSE(sigh.empty());
ASSERT_EQ(sigh.size(), 2u);
sink.disconnect(&l1);
ASSERT_FALSE(sigh.empty());