From 306f34a3681b0d8d87ac5fb3dfd76817f4a8ba7c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 17 Mar 2009 22:02:56 +0000 Subject: [PATCH] allow using CPPUNIT_ASSERT_EQUAL(int,unsigned) even on 64 bit platforms (see r59576) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cppunit.h | 3 ++- tests/controls/headerctrltest.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index 81dcbe2ef2..c965925b80 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -152,7 +152,8 @@ CPPUNIT_NS_END WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short) -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(size_t) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned) +WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long) // Use this macro to compare a wxArrayString with the pipe-separated elements // of the given string diff --git a/tests/controls/headerctrltest.cpp b/tests/controls/headerctrltest.cpp index 2b02f830a5..f13f4a891f 100644 --- a/tests/controls/headerctrltest.cpp +++ b/tests/controls/headerctrltest.cpp @@ -78,19 +78,19 @@ void HeaderCtrlTestCase::tearDown() void HeaderCtrlTestCase::AddDelete() { - CPPUNIT_ASSERT_EQUAL( 0, (size_t)m_header->GetColumnCount() ); + CPPUNIT_ASSERT_EQUAL( 0, m_header->GetColumnCount() ); m_header->AppendColumn(wxHeaderColumnSimple("Column 1")); - CPPUNIT_ASSERT_EQUAL( 1, (size_t)m_header->GetColumnCount() ); + CPPUNIT_ASSERT_EQUAL( 1, m_header->GetColumnCount() ); m_header->AppendColumn(wxHeaderColumnSimple("Column 2")); - CPPUNIT_ASSERT_EQUAL( 2, (size_t)m_header->GetColumnCount() ); + CPPUNIT_ASSERT_EQUAL( 2, m_header->GetColumnCount() ); m_header->InsertColumn(wxHeaderColumnSimple("Column 0"), 0); - CPPUNIT_ASSERT_EQUAL( 3, (size_t)m_header->GetColumnCount() ); + CPPUNIT_ASSERT_EQUAL( 3, m_header->GetColumnCount() ); m_header->DeleteColumn(2); - CPPUNIT_ASSERT_EQUAL( 2, (size_t)m_header->GetColumnCount() ); + CPPUNIT_ASSERT_EQUAL( 2, m_header->GetColumnCount() ); } void HeaderCtrlTestCase::BestSize() -- 2.45.2