From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 13 Apr 2010 16:38:18 +0000 (+0000)
Subject: Exclude wxWeakRef tests not compiling with VC6 from compilation.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/deee2b18856aae8c6b0993cbb7686c7b0ef1bf57?ds=inline

Exclude wxWeakRef tests not compiling with VC6 from compilation.

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
---

diff --git a/tests/weakref/weakref.cpp b/tests/weakref/weakref.cpp
index 3550d13805..ef1b8ad0f8 100644
--- a/tests/weakref/weakref.cpp
+++ b/tests/weakref/weakref.cpp
@@ -80,8 +80,12 @@ void WeakRefTestCase::DeclareTest()
 {
     {
         // 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);
+#endif // __VISUALC6__
 
         wxObject o; // Should not work
         wxEvtHandler eh;
@@ -129,6 +133,9 @@ void WeakRefTestCase::AssignTest()
     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;
 
@@ -140,6 +147,7 @@ void WeakRefTestCase::AssignTest()
 
     CPPUNIT_ASSERT( !wro1 );
     CPPUNIT_ASSERT( !wro2 );
+#endif // __VISUALC6__
 }
 
 void WeakRefTestCase::AssignWeakRefTest()