X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/cppunit.h?ds=inline diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 7d608a63ca..f6aee85817 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -49,9 +49,15 @@ #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) + + // and also 4100 (unreferenced formal parameter) in extensions/ + // ExceptionTestCaseDecorator.h + #pragma warning(disable:4100) #endif #include @@ -61,7 +67,7 @@ #include #ifdef __VISUALC__ - #pragma warning(default:4701) + #pragma warning(pop) #endif #include "wx/afterstd.h" @@ -194,10 +200,14 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) 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::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) -#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