From d5236dfffd5f9e722f135691c29107137a5c2dcd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Oct 2009 23:54:47 +0000 Subject: [PATCH] Fix g++ compilation of wxFileSystemWatcher test after VC6 fix. Enums can't be used to deduce template parameters so cast WAIT_DURATION to int explicitly before passing it to wxString::Format(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/fswatcher/fswatchertest.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp index 53d1f6607f..80fea6d5e8 100644 --- a/tests/fswatcher/fswatchertest.cpp +++ b/tests/fswatcher/fswatchertest.cpp @@ -305,15 +305,13 @@ public: virtual bool AfterWait() { // fail if still no events - if (!tested) - { - wxString s; - s.Printf("No events from watcher during %d seconds!", - WAIT_DURATION); - CPPUNIT_FAIL((const char*)s); - } - - return true; + WX_ASSERT_MESSAGE + ( + ("No events during %d seconds!", static_cast(WAIT_DURATION)), + tested + ); + + return true; } virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt) -- 2.45.2