From c8d971c59900217d519990cfda19c88a3be451a2 Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Fri, 29 Mar 2002 19:56:29 +0000
Subject: [PATCH] ICU-900 Fixed some compiler warnings.

X-SVN-Rev: 8304
---
 icu4c/source/test/intltest/canittst.cpp | 22 ++++++++++++----------
 icu4c/source/test/intltest/canittst.h   |  8 ++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/icu4c/source/test/intltest/canittst.cpp b/icu4c/source/test/intltest/canittst.cpp
index 5ea0faf6a1a..9668fd566c9 100644
--- a/icu4c/source/test/intltest/canittst.cpp
+++ b/icu4c/source/test/intltest/canittst.cpp
@@ -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;
 
diff --git a/icu4c/source/test/intltest/canittst.h b/icu4c/source/test/intltest/canittst.h
index 2b1042b3b43..b9e6c7b9933 100644
--- a/icu4c/source/test/intltest/canittst.h
+++ b/icu4c/source/test/intltest/canittst.h
@@ -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);
 };