From 8c16b54cfe275dd48e2b9c321db97b345f2b3be1 Mon Sep 17 00:00:00 2001 From: Michael Lukashov Date: Fri, 18 May 2012 21:33:59 +0400 Subject: [PATCH] testnetbox_02.cpp: fix --- src/NetBox/testnetbox_02.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/NetBox/testnetbox_02.cpp b/src/NetBox/testnetbox_02.cpp index 6a9367e620..f2c59697f0 100644 --- a/src/NetBox/testnetbox_02.cpp +++ b/src/NetBox/testnetbox_02.cpp @@ -132,7 +132,7 @@ class TClass1 : TObject void SetOnChange(TNotifyEvent Event) { FOnChange = Event; } virtual void Changed() { - if (FOnChange.num_slots() > 0) + if (!FOnChange.empty()) { FOnChange(this); OnChangeNotifyEventTriggered = true; @@ -150,10 +150,7 @@ class TClass1 : TObject class TClass2 // : public boost::signals::trackable { - // typedef void result_type; typedef fastdelegate::FastDelegate2 TClickEvent; - typedef TClickEvent::slot_type TClickEvent; - // typedef TClickEvent::slot_function_type TClickEvent; public: TClass2() : @@ -207,7 +204,7 @@ BOOST_FIXTURE_TEST_CASE(test2, base_fixture_t) TClass2 cl2; TClass3 cl3; cl2.SetOnClick(fastdelegate::bind(&TClass3::ClickEventHandler, &cl3, _1, _2)); - BOOST_CHECK(cl2.GetOnClick().num_slots() > 0); + BOOST_CHECK(!cl2.GetOnClick().empty()); cl2.Click(); BOOST_CHECK_EQUAL(true, cl2.OnClickTriggered); BOOST_CHECK_EQUAL(true, cl3.ClickEventHandlerTriggered);