Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxFSW test compilation with VC6.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-10-22 16:57:41 +00:00
parent fe5816f08f
commit 771ce939f3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/fswatcher/fswatchertest.cpp
View File

@@ -147,8 +147,10 @@ public:
CPPUNIT_ASSERT(dir.DirExists()); CPPUNIT_ASSERT(dir.DirExists());
// just to be really sure we know what we remove // just to be really sure we know what we remove
CPPUNIT_ASSERT(dir.GetDirs().Last() == "fswatcher_test"); CPPUNIT_ASSERT_EQUAL( "fswatcher_test", dir.GetDirs().Last() );
CPPUNIT_ASSERT(dir.Rmdir(wxPATH_RMDIR_RECURSIVE));
// 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) static wxFileName RandomName(const wxFileName& base, int length = 10)
@@ -182,7 +184,7 @@ EventGenerator* EventGenerator::ms_instance = 0;
class EventHandler : public wxEvtHandler class EventHandler : public wxEvtHandler
{ {
public: public:
const static int WAIT_DURATION = 3; enum { WAIT_DURATION = 3 };
EventHandler() : EventHandler() :
eg(EventGenerator::Get()), m_loop(0), m_count(0), m_watcher(0) eg(EventGenerator::Get()), m_loop(0), m_count(0), m_watcher(0)