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

more attempts to fix CppUnit::assertEquals for VC6 without breaking everything else

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-04 11:59:11 +00:00
parent e84ed895ea
commit bad631840c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/cppunit.h
View File

@@ -56,6 +56,7 @@
#include "wx/afterstd.h" #include "wx/afterstd.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/filefn.h" // for wxFileOffset
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -122,7 +123,8 @@ assertEquals(const wchar_t *expected,
} }
// and another to be able to specify (usually literal) ints as expected values // and another to be able to specify (usually literal) ints as expected values
// for functions returning size_t // for functions returning size_t/long/wxFileOffset
WX_CPPUNIT_ASSERT_EQUALS(int, long)
WX_CPPUNIT_ASSERT_EQUALS(int, size_t) WX_CPPUNIT_ASSERT_EQUALS(int, size_t)
WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset) WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
@@ -133,6 +135,7 @@ WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
#ifdef __VISUALC6__ #ifdef __VISUALC6__
WX_CPPUNIT_ASSERT_EQUALS(int, int) WX_CPPUNIT_ASSERT_EQUALS(int, int)
WX_CPPUNIT_ASSERT_EQUALS(long, long)
WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t) WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t)
WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset) WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset)