From bad631840c464e6b8623e47f06c26ee52511ab35 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Jan 2009 11:59:11 +0000 Subject: [PATCH] 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 --- include/wx/cppunit.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index f2be3355f6..b44daff6dd 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -56,6 +56,7 @@ #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 -// 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) @@ -133,6 +135,7 @@ WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset) #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) -- 2.45.2