From 0739e2eef923040b51c664a22c7a6765fbd8a6f1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Apr 2006 20:18:33 +0000
Subject: [PATCH] Apple gcc compilation fixes: for it size_t and unsigned are
not the same type for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
tests/strings/unicode.cpp | 4 ++--
tests/textfile/textfiletest.cpp | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp
index 151af98639..5061b9e72a 100644
--- a/tests/strings/unicode.cpp
+++ b/tests/strings/unicode.cpp
@@ -274,7 +274,7 @@ void UnicodeTestCase::ConversionUTF16()
// got confused in this case
size_t len;
wxWCharBuffer wbuf(conv.cMB2WC("\x01\0\0B\0C" /* A macron BC */, 6, &len));
- CPPUNIT_ASSERT_EQUAL( 3u, len );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, len );
}
void UnicodeTestCase::ConversionUTF32()
@@ -299,7 +299,7 @@ void UnicodeTestCase::ConversionUTF32()
size_t len;
wxWCharBuffer wbuf(conv.cMB2WC("\0\0\x01\0\0\0\0B\0\0\0C" /* A macron BC */,
12, &len));
- CPPUNIT_ASSERT_EQUAL( 3u, len );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, len );
}
#endif // wxUSE_WCHAR_T
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index 4140d5e05c..dfd2855af3 100644
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -97,7 +97,7 @@ void TextFileTestCase::ReadEmpty()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
- CPPUNIT_ASSERT_EQUAL( 0u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)0, f.GetLineCount() );
}
void TextFileTestCase::ReadDOS()
@@ -107,7 +107,7 @@ void TextFileTestCase::ReadDOS()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
- CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -121,7 +121,7 @@ void TextFileTestCase::ReadUnix()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
- CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -135,7 +135,7 @@ void TextFileTestCase::ReadMac()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
- CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -149,7 +149,7 @@ void TextFileTestCase::ReadMixed()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
- CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) );
@@ -168,7 +168,7 @@ void TextFileTestCase::ReadUTF8()
wxTextFile f;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName()), wxConvUTF8) );
- CPPUNIT_ASSERT_EQUAL( 2u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)2, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(1) );
#ifdef wxHAVE_U_ESCAPE
@@ -188,7 +188,7 @@ void TextFileTestCase::ReadUTF16()
wxMBConvUTF16 conv;
CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName()), conv) );
- CPPUNIT_ASSERT_EQUAL( 2u, f.GetLineCount() );
+ CPPUNIT_ASSERT_EQUAL( (size_t)2, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(1) );
--
2.47.2