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

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index 81dcbe2ef2c75afa1d4906ba334158f0ee984c73..c965925b80c463bfae5139d3aaac699c4289299c 100644 (file)
--- 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(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
 
 // 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 2b02f830a52326945569e4048f4dab7626ae69ab..f13f4a891ff2d872194508af88239b5bc3ae5ec2 100644 (file)
--- a/tests/controls/headerctrltest.cpp
+++ b/tests/controls/headerctrltest.cpp
@@ -78,19 +78,19 @@ void HeaderCtrlTestCase::tearDown()
 
 void HeaderCtrlTestCase::AddDelete()
 {
 
 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"));
 
     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"));
 
     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);
 
     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);
 
     m_header->DeleteColumn(2);

-    CPPUNIT_ASSERT_EQUAL( 2, (size_t)m_header->GetColumnCount() );
+    CPPUNIT_ASSERT_EQUAL( 2, m_header->GetColumnCount() );

 }
 
 void HeaderCtrlTestCase::BestSize()
 }
 
 void HeaderCtrlTestCase::BestSize()