ICU-900 Fixed some compiler warnings.

X-SVN-Rev: 8304
This commit is contained in:
George Rhoten 2002-03-29 19:56:29 +00:00
parent 6035ae8c7c
commit c8d971c599
2 changed files with 16 additions and 14 deletions

View file

@ -45,17 +45,17 @@ static UnicodeString str(const char *input)
CanonicalIteratorTest::CanonicalIteratorTest() :
name(NULL), hex(NULL)
nameTrans(NULL), hexTrans(NULL)
{
}
CanonicalIteratorTest::~CanonicalIteratorTest()
{
if(name != NULL) {
delete(name);
if(nameTrans != NULL) {
delete(nameTrans);
}
if(hex != NULL) {
delete(hex);
if(hexTrans != NULL) {
delete(hexTrans);
}
}
@ -195,22 +195,24 @@ UnicodeString CanonicalIteratorTest::getReadable(const UnicodeString &s) {
if (s.length() == 0) return "";
// set up for readable display
if(verbose) {
if (name == NULL) name = Transliterator::createInstance("[^\\ -\\u007F] name", UTRANS_FORWARD, status);
if (nameTrans == NULL)
nameTrans = Transliterator::createInstance("[^\\ -\\u007F] name", UTRANS_FORWARD, status);
UnicodeString sName = s;
name->transliterate(sName);
nameTrans->transliterate(sName);
result += sName;
result += ";";
}
if (hex == NULL) hex = Transliterator::createInstance("[^\\ -\\u007F] hex", UTRANS_FORWARD, status);
if (hexTrans == NULL)
hexTrans = Transliterator::createInstance("[^\\ -\\u007F] hex", UTRANS_FORWARD, status);
UnicodeString sHex = s;
hex->transliterate(sHex);
hexTrans->transliterate(sHex);
result += sHex;
result += "]";
return result;
//return "[" + (verbose ? name->transliterate(s) + "; " : "") + hex->transliterate(s) + "]";
}
int compareUnicodeStrings(const void *s1, const void *s2) {
U_CAPI int compareUnicodeStrings(const void *s1, const void *s2) {
UnicodeString **st1 = (UnicodeString **)s1;
UnicodeString **st2 = (UnicodeString **)s2;

View file

@ -5,8 +5,8 @@
********************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu/source/test/intltest/canittst.h,v $
* $Date: 2002/03/19 07:18:06 $
* $Revision: 1.1 $
* $Date: 2002/03/29 19:56:29 $
* $Revision: 1.2 $
*
*****************************************************************************************
* @author Mark E. Davis
@ -40,8 +40,8 @@ public:
private:
void expectEqual(const UnicodeString &message, const UnicodeString &item, const UnicodeString &a, const UnicodeString &b);
Transliterator *name;
Transliterator *hex;
Transliterator *nameTrans;
Transliterator *hexTrans;
UnicodeString getReadable(const UnicodeString &obj);
};