From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 22 Oct 2009 16:57:41 +0000 (+0000)
Subject: Fix wxFSW test compilation with VC6.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/771ce939f3d9948399b77b6e164b2cb6df2dc29f

Fix wxFSW test compilation with VC6.

Work around an internal compiler error and don't initialize static variable
when declaring it as VC6 doesn't support this.

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

diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index 32a9eb26fb..53d1f6607f 100644
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -147,8 +147,10 @@ public:
         CPPUNIT_ASSERT(dir.DirExists());
 
         // just to be really sure we know what we remove
-        CPPUNIT_ASSERT(dir.GetDirs().Last() == "fswatcher_test");
-        CPPUNIT_ASSERT(dir.Rmdir(wxPATH_RMDIR_RECURSIVE));
+        CPPUNIT_ASSERT_EQUAL( "fswatcher_test", dir.GetDirs().Last() );
+
+        // FIXME-VC6: using non-static Rmdir() results in ICE
+        CPPUNIT_ASSERT( wxFileName::Rmdir(dir.GetFullPath(), wxPATH_RMDIR_RECURSIVE) );
     }
 
     static wxFileName RandomName(const wxFileName& base, int length = 10)
@@ -182,7 +184,7 @@ EventGenerator* EventGenerator::ms_instance = 0;
 class EventHandler : public wxEvtHandler
 {
 public:
-    const static int WAIT_DURATION = 3;
+    enum { WAIT_DURATION = 3 };
 
     EventHandler() :
         eg(EventGenerator::Get()), m_loop(0), m_count(0), m_watcher(0)