From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 May 2009 10:56:14 +0000 (+0000)
Subject: fix errors in EvtHandlerTestCase::BindFunctor() in optimized build: apparently compil... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/09be33645a3b8757c2dcec9324993b88bc283fc0?ds=inline

fix errors in EvtHandlerTestCase::BindFunctor() in optimized build: apparently compiler is smart enough to detect that the same object can be used for all temporaries

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/events/evthandler.cpp b/tests/events/evthandler.cpp
index 863f879de8..366fb8e775 100644
--- a/tests/events/evthandler.cpp
+++ b/tests/events/evthandler.cpp
@@ -310,18 +310,18 @@ void EvtHandlerTestCase::BindFunctor()
     handler.Bind( MyEventType, functor, 0, 0 );
     handler.Unbind( MyEventType, functor, 0, 0 );
 
-    // Test that a temporary functor is working as well. Note that Unbind will
-    // fail because a functor can only be unbound if it is the same instance as
-    // in Bind!
-
+    // test that a temporary functor is working as well and also test that
+    // unbinding a different (though equal) instance of the same functor does
+    // not work
+    MyFunctor func;
     handler.Bind( MyEventType, MyFunctor() );
-    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, MyFunctor() ));
+    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, func ));
 
     handler.Bind( MyEventType, MyFunctor(), 0 );
-    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, MyFunctor(), 0 ));
+    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, func, 0 ));
 
     handler.Bind( MyEventType, MyFunctor(), 0, 0 );
-    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, MyFunctor(), 0, 0 ));
+    CPPUNIT_ASSERT( !handler.Unbind( MyEventType, func, 0, 0 ));
 }
 
 void EvtHandlerTestCase::BindMethod()