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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index f2be3355f6fc38c2de0e1b2c98cd7686ec5ec9c3..b44daff6ddefa79be57dcec973f558b264ca1372 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -56,6 +56,7 @@
 #include "wx/afterstd.h"
 
 #include "wx/string.h"
 #include "wx/afterstd.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, wxFileOffset)
 
 WX_CPPUNIT_ASSERT_EQUALS(int, size_t)
 WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
 


@@ -133,6 +135,7 @@ WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
 #ifdef __VISUALC6__
 
 WX_CPPUNIT_ASSERT_EQUALS(int, int)
 #ifdef __VISUALC6__
 
 WX_CPPUNIT_ASSERT_EQUALS(int, int)

+WX_CPPUNIT_ASSERT_EQUALS(long, long)

 WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t)
 WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset)
 
 WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t)
 WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset)