need to overload assertEquals(int,short) too to resolve ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bad631840c
commit
a8fd1047b8
@ -123,8 +123,9 @@ assertEquals(const wchar_t *expected,
|
||||
}
|
||||
|
||||
// and another to be able to specify (usually literal) ints as expected values
|
||||
// for functions returning size_t/long/wxFileOffset
|
||||
// for functions returning size_t/short/long/wxFileOffset
|
||||
WX_CPPUNIT_ASSERT_EQUALS(int, long)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(int, short)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(int, size_t)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
|
||||
|
||||
@ -136,6 +137,7 @@ WX_CPPUNIT_ASSERT_EQUALS(int, wxFileOffset)
|
||||
|
||||
WX_CPPUNIT_ASSERT_EQUALS(int, int)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(long, long)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(short, short)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(size_t, size_t)
|
||||
WX_CPPUNIT_ASSERT_EQUALS(wxFileOffset, wxFileOffset)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user