commit be7804f19c911f553a7b9c3e92b6a91d5631c40a
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 23 00:53:47 2015 +0200
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Oct 23 21:43:31 2015 +0200
tree 2ccae38a7e0f2c1ffbaf7c75a44114940e839369
parent 3507b553c8cb336effd1cc311d85577ff1211566

util: Signal: make handler self-disconnection safer

Change-Id: I15eeed19af2da23187d7700ee7729f397491eca0
Refs: #2333

tests/unit-tests/util/signal.t.cpp

diff --git a/tests/unit-tests/util/signal.t.cpp b/tests/unit-tests/util/signal.t.cpp
index 3b263b4..c06c4ac 100644
--- a/tests/unit-tests/util/signal.t.cpp
+++ b/tests/unit-tests/util/signal.t.cpp
@@ -381,15 +381,13 @@
   int hit = 0;
   Connection connection;
   BOOST_CHECK_EQUAL(connection.isConnected(), false);
-  connection = so.sig.connect(bind([] (int& hit, SignalOwner0& so, Connection& connection) {
+  connection = so.sig.connect([&so, &connection, &hit] {
     ++hit;
     BOOST_CHECK_EQUAL(connection.isConnected(), true);
     connection.disconnect();
     BOOST_CHECK_EQUAL(connection.isConnected(), false);
     BOOST_CHECK_EQUAL(so.isSigEmpty(), false); // disconnecting hasn't taken effect
-  }, ref(hit), ref(so), ref(connection)));
-  // Bug 2302, 2523: variables needs to be bound to the handler;
-  // lambda capture won't work because closure would be destructed at .disconnect
+  });
 
   so.emitSignal(sig);
   BOOST_CHECK_EQUAL(hit, 1); // handler called