Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apple gcc compilation fixes: for it size_t and unsigned are not the same type for some reason

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-02 20:18:33 +00:00
parent 69373110a5
commit 0739e2eef9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/strings/unicode.cpp
View File

@@ -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

14
tests/textfile/textfiletest.cpp
View File

@@ -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) );