From a8fd1047b81302d010ff29b9c0885819cbf25011 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Jan 2009 12:32:26 +0000 Subject: [PATCH] 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 --- include/wx/cppunit.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index b44daff6dd..b11bebf5a9 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -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) -- 2.45.2