ICU-3221 Fix some AIX linker warnings

X-SVN-Rev: 12987

icu4c/source/i18n/hextouni.cpp

@@ -20,7 +20,7 @@
 
 U_NAMESPACE_BEGIN
 
-const char HexToUnicodeTransliterator::fgClassID=0;
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(HexToUnicodeTransliterator)
 
 /**
  * ID for this transliterator.
@@ -36,7 +36,7 @@ const char HexToUnicodeTransliterator::_ID[] = "Hex-Any";
  * The multiple backslashes resolve to a single backslash
  * in the effective prefix.
  */
-const UChar HexToUnicodeTransliterator::DEFAULT_PATTERN[] = {
+static const UChar DEFAULT_PATTERN[] = {
     0x5C, 0x5C, 0x75, 0x30, 0x30, 0x30, 0x30, 0x3B,  /* "\\u0000;" */
     0x5C, 0x5C, 0x55, 0x30, 0x30, 0x30, 0x30, 0x3B,  /* "\\U0000;" */
     0x75, 0x2B, 0x30, 0x30, 0x30, 0x30, 0x3B,        /* "u+0000;" */
@@ -47,6 +47,8 @@ static const UChar gQuadA[] = {
     0x41, 0x41, 0x41, 0x41, 0
 };  /* "AAAA" */
 
+HexToUnicodeTransliterator::~HexToUnicodeTransliterator() {}
+
 /**
  * Constructs a transliterator.
  */

icu4c/source/i18n/hextouni.h

@@ -37,11 +37,6 @@ class U_I18N_API HexToUnicodeTransliterator : public Transliterator {
      */
     static const char _ID[];
 
-    /**
-     * The pattern used by the default constructor
-     */
-    static const UChar DEFAULT_PATTERN[];
-
     // Character constants defined here to avoid ASCII dependency
     enum {
         SEMICOLON = 0x003B, // ';'
@@ -66,12 +61,6 @@ class U_I18N_API HexToUnicodeTransliterator : public Transliterator {
      */
     int32_t affixCount;
 
-    /**
-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
-     */
-    static const char fgClassID;
-
 public:
 
     /**
@@ -171,26 +160,16 @@ public:
      *
      * @draft ICU 2.2
      */
-    virtual inline UClassID getDynamicClassID() const;
+    virtual UClassID getDynamicClassID() const;
 
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *
      * @draft ICU 2.2
      */
-    static inline UClassID getStaticClassID();
+    static UClassID getStaticClassID();
 };
 
-inline HexToUnicodeTransliterator::~HexToUnicodeTransliterator() {}
-
-inline UClassID
-HexToUnicodeTransliterator::getStaticClassID()
-{ return (UClassID)&fgClassID; }
-
-inline UClassID
-HexToUnicodeTransliterator::getDynamicClassID() const
-{ return HexToUnicodeTransliterator::getStaticClassID(); }
-
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */

icu4c/source/i18n/strrepl.cpp

@@ -21,7 +21,8 @@ U_NAMESPACE_BEGIN
 
 const UChar EMPTY[] = { 0 }; // empty string: ""
 
-const char StringReplacer::fgClassID=0;
+UnicodeReplacer::~UnicodeReplacer() {}
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(StringReplacer)
 
 /**
  * Construct a StringReplacer that sets the emits the given output

icu4c/source/i18n/strrepl.h

@@ -67,12 +67,6 @@ class StringReplacer : public UnicodeFunctor, public UnicodeReplacer {
      */
     const TransliterationRuleData* data;
 
-    /**
-     * The address of this static class variable serves as this class's ID
-     * for ICU "poor man's RTTI".
-     */
-    static const char fgClassID;
-
  public:
 
     /**
@@ -147,19 +141,19 @@ class StringReplacer : public UnicodeFunctor, public UnicodeReplacer {
      */
     virtual void setData(const TransliterationRuleData*);
 
-    /**
-     * ICU "poor man's RTTI", returns a UClassID for the actual class.
-     *
-     * @draft ICU 2.2
-     */
-    virtual inline UClassID getDynamicClassID() const { return getStaticClassID(); }
-
     /**
      * ICU "poor man's RTTI", returns a UClassID for this class.
      *
      * @draft ICU 2.2
      */
-    static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+    static UClassID getStaticClassID();
+
+    /**
+     * ICU "poor man's RTTI", returns a UClassID for the actual class.
+     *
+     * @draft ICU 2.2
+     */
+    virtual UClassID getDynamicClassID() const;
 };
 
 U_NAMESPACE_END

icu4c/source/i18n/unicode/unirepl.h

@@ -36,7 +36,7 @@ class U_I18N_API UnicodeReplacer /* not : public UObject because this is an inte
      * Destructor.
      * @draft ICU 2.4
      */
-    virtual inline ~UnicodeReplacer() {};
+    virtual ~UnicodeReplacer();
 
     /**
      * Replace characters in 'text' from 'start' to 'limit' with the