minor icc warning fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-19 09:55:27 +00:00
parent 2c2944d6aa
commit 93a800a95e
11 changed files with 47 additions and 47 deletions

View File

@@ -243,12 +243,12 @@ void UnicodeTestCase::ConversionEmpty()
size_t len;
#if wxUSE_UNICODE
wxCharBuffer buf = wxConvLibc.cWC2MB(L"", 0, &len);
wxConvLibc.cWC2MB(L"", 0, &len);
#else // !wxUSE_UNICODE
wxWCharBuffer wbuf = wxConvLibc.cMB2WC("", 0, &len);
wxConvLibc.cMB2WC("", 0, &len);
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
CPPUNIT_ASSERT(len == 0);
CPPUNIT_ASSERT_EQUAL( 0, len );
}
void UnicodeTestCase::ConversionWithNULs()
@@ -368,8 +368,8 @@ void UnicodeTestCase::ConversionUTF16()
// terminate the string, this exposed a bug in our conversion code which
// got confused in this case
size_t len;
wxWCharBuffer wbuf(conv.cMB2WC("\x01\0\0B\0C" /* A macron BC */, 6, &len));
CPPUNIT_ASSERT_EQUAL( (size_t)3, len );
conv.cMB2WC("\x01\0\0B\0C" /* A macron BC */, 6, &len);
CPPUNIT_ASSERT_EQUAL( 3, len );
}
void UnicodeTestCase::ConversionUTF32()
@@ -392,9 +392,8 @@ 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( (size_t)3, len );
conv.cMB2WC("\0\0\x01\0\0\0\0B\0\0\0C" /* A macron BC */, 12, &len);
CPPUNIT_ASSERT_EQUAL( 3, len );
}
void UnicodeTestCase::IsConvOk()