]> git.saurik.com Git - wxWidgets.git/commitdiff
Exclude wxWeakRef tests not compiling with VC6 from compilation.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 13 Apr 2010 16:38:18 +0000 (16:38 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 13 Apr 2010 16:38:18 +0000 (16:38 +0000)
The ctor used by these tests can't be enabled for VC6 (see r63955), simply
disable them to allow the rest to compile.

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

tests/weakref/weakref.cpp

index 3550d138055c243ff392d29fff8114c8ae85eabe..ef1b8ad0f8985172b33c9639a27bad0c345504b6 100644 (file)
@@ -80,8 +80,12 @@ void WeakRefTestCase::DeclareTest()
 {
     {
         // Not initializing or initializing with NULL should work too
 {
     {
         // Not initializing or initializing with NULL should work too
+        //
+        // FIXME-VC6: but it doesn't with VC6, see comment in wx/weakref.h
+#ifndef __VISUALC6__
         wxWeakRef<wxEvtHandler> wroDef;
         wxWeakRef<wxEvtHandler> wro0(NULL);
         wxWeakRef<wxEvtHandler> wroDef;
         wxWeakRef<wxEvtHandler> wro0(NULL);
+#endif // __VISUALC6__
 
         wxObject o; // Should not work
         wxEvtHandler eh;
 
         wxObject o; // Should not work
         wxEvtHandler eh;
@@ -129,6 +133,9 @@ void WeakRefTestCase::AssignTest()
     CPPUNIT_ASSERT( !wro2 );
 
     // Explicitly resetting should work too
     CPPUNIT_ASSERT( !wro2 );
 
     // Explicitly resetting should work too
+    //
+    // FIXME-VC6: as above, it doesn't work with VC6, see wx/weakref.h
+#ifndef __VISUALC6__
     wxEvtHandler eh;
     wxObjectTrackable ot;
 
     wxEvtHandler eh;
     wxObjectTrackable ot;
 
@@ -140,6 +147,7 @@ void WeakRefTestCase::AssignTest()
 
     CPPUNIT_ASSERT( !wro1 );
     CPPUNIT_ASSERT( !wro2 );
 
     CPPUNIT_ASSERT( !wro1 );
     CPPUNIT_ASSERT( !wro2 );
+#endif // __VISUALC6__
 }
 
 void WeakRefTestCase::AssignWeakRefTest()
 }
 
 void WeakRefTestCase::AssignWeakRefTest()