Add lambda-friendly wxDialog::ShowWindowModalThenDo().

[wxWidgets.git] / include / wx / cppunit.h

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 7d608a63cae5c831397353403b1184d1be45890c..89edd9165f03972f4537213ab361d662d2799e93 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -3,7 +3,6 @@
 // Purpose:     wrapper header for CppUnit headers
 // Author:      Vadim Zeitlin
 // Created:     15.02.04
 // Purpose:     wrapper header for CppUnit headers
 // Author:      Vadim Zeitlin
 // Created:     15.02.04

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Vadim Zeitlin
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 Vadim Zeitlin
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


@@ -49,9 +48,15 @@
 
 #include "wx/beforestd.h"
 #ifdef __VISUALC__
 
 #include "wx/beforestd.h"
 #ifdef __VISUALC__

+    #pragma warning(push)
+

     // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
     // used without having been initialized) in TestAssert.h
     #pragma warning(disable:4701)
     // with cppunit 1.12 we get many bogus warnings 4701 (local variable may be
     // used without having been initialized) in TestAssert.h
     #pragma warning(disable:4701)

+
+    // and also 4100 (unreferenced formal parameter) in extensions/
+    // ExceptionTestCaseDecorator.h
+    #pragma warning(disable:4100)

 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #endif
 
 #include <cppunit/extensions/TestFactoryRegistry.h>


@@ -61,7 +66,7 @@
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__
 #include <cppunit/CompilerOutputter.h>
 
 #ifdef __VISUALC__

-    #pragma warning(default:4701)
+    #pragma warning(pop)

 #endif
 #include "wx/afterstd.h"
 
 #endif
 #include "wx/afterstd.h"
 


@@ -194,10 +199,14 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 

-#if defined(wxLongLong_t) && !defined(wxLongLongIsLong)
+#if defined( __VMS ) && defined( __ia64 )
+WX_CPPUNIT_ALLOW_EQUALS_TO_INT(std::basic_streambuf<char>::pos_type);
+#endif
+
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG

 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)

-#endif
+#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG

 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string