ICU-10884 Comments from roubert.

X-SVN-Rev: 35882

diff --git a/icu4c/source/i18n/reldatefmt.cpp b/icu4c/source/i18n/reldatefmt.cpp
index 9041dba21f478dc958e13c0eada15814a21baf05..685a5c7253d65505e4474ab1c293caed4fd41dbf 100644 (file)
--- a/icu4c/source/i18n/reldatefmt.cpp
+++ b/icu4c/source/i18n/reldatefmt.cpp
@@ -53,19 +53,6 @@ U_CDECL_END
 
 U_NAMESPACE_BEGIN
 
-static int32_t getStyleIndex(UDateRelativeDateTimeFormatterStyle style) {
-    switch (style) {
-        case UDAT_STYLE_LONG:
-            return 0;
-        case UDAT_STYLE_SHORT:
-            return 1;
-        case UDAT_STYLE_NARROW:
-            return 2;
-        default:
-            return 0;
-    }
-}
-
 // RelativeDateTimeFormatter specific data for a single locale
 class RelativeDateTimeCacheData: public SharedObject {
 public:
@@ -356,20 +343,20 @@ static void addTimeUnits(
     addTimeUnit(
         resource,
         path,
-        cacheData.relativeUnits[0][relativeUnit],
-        cacheData.absoluteUnits[0][absoluteUnit],
+        cacheData.relativeUnits[UDAT_STYLE_LONG][relativeUnit],
+        cacheData.absoluteUnits[UDAT_STYLE_LONG][absoluteUnit],
         status);
     addTimeUnit(
         resource,
         pathShort,
-        cacheData.relativeUnits[1][relativeUnit],
-        cacheData.absoluteUnits[1][absoluteUnit],
+        cacheData.relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
+        cacheData.absoluteUnits[UDAT_STYLE_SHORT][absoluteUnit],
         status);
     addTimeUnit(
         resource,
         pathNarrow,
-        cacheData.relativeUnits[2][relativeUnit],
-        cacheData.absoluteUnits[2][absoluteUnit],
+        cacheData.relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
+        cacheData.absoluteUnits[UDAT_STYLE_NARROW][absoluteUnit],
         status);
 }
 
@@ -382,17 +369,17 @@ static void initRelativeUnits(
     initRelativeUnit(
             resource,
             path,
-            relativeUnits[0][relativeUnit],
+            relativeUnits[UDAT_STYLE_LONG][relativeUnit],
             status);
     initRelativeUnit(
             resource,
             pathShort,
-            relativeUnits[1][relativeUnit],
+            relativeUnits[UDAT_STYLE_SHORT][relativeUnit],
             status);
     initRelativeUnit(
             resource,
             pathNarrow,
-            relativeUnits[2][relativeUnit],
+            relativeUnits[UDAT_STYLE_NARROW][relativeUnit],
             status);
 }
 
@@ -406,23 +393,23 @@ static void addWeekDays(
     addWeekDay(
             resource,
             path,
-            daysOfWeek[0],
+            daysOfWeek[UDAT_STYLE_LONG],
             absoluteUnit,
-            absoluteUnits[0],
+            absoluteUnits[UDAT_STYLE_LONG],
             status);
     addWeekDay(
             resource,
             pathShort,
-            daysOfWeek[1],
+            daysOfWeek[UDAT_STYLE_SHORT],
             absoluteUnit,
-            absoluteUnits[1],
+            absoluteUnits[UDAT_STYLE_SHORT],
             status);
     addWeekDay(
             resource,
             pathNarrow,
-            daysOfWeek[2],
+            daysOfWeek[UDAT_STYLE_NARROW],
             absoluteUnit,
-            absoluteUnits[2],
+            absoluteUnits[UDAT_STYLE_NARROW],
             status);
 }
 
@@ -479,33 +466,33 @@ static UBool loadUnitData(
     getStringWithFallback(
             resource,
             "fields/second/relative/0",
-            cacheData.absoluteUnits[0][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
+            cacheData.absoluteUnits[UDAT_STYLE_LONG][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
             status);
     getStringWithFallback(
             resource,
             "fields/second-short/relative/0",
-            cacheData.absoluteUnits[1][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
+            cacheData.absoluteUnits[UDAT_STYLE_SHORT][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
             status);
     getStringWithFallback(
             resource,
             "fields/second-narrow/relative/0",
-            cacheData.absoluteUnits[2][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
+            cacheData.absoluteUnits[UDAT_STYLE_NARROW][UDAT_ABSOLUTE_NOW][UDAT_DIRECTION_PLAIN],
             status);
-    UnicodeString daysOfWeek[3][7];
+    UnicodeString daysOfWeek[UDAT_STYLE_COUNT][7];
     readDaysOfWeek(
             resource,
             "calendar/gregorian/dayNames/stand-alone/wide",
-            daysOfWeek[0],
+            daysOfWeek[UDAT_STYLE_LONG],
             status);
     readDaysOfWeek(
             resource,
             "calendar/gregorian/dayNames/stand-alone/short",
-            daysOfWeek[1],
+            daysOfWeek[UDAT_STYLE_SHORT],
             status);
     readDaysOfWeek(
             resource,
             "calendar/gregorian/dayNames/stand-alone/narrow",
-            daysOfWeek[2],
+            daysOfWeek[UDAT_STYLE_NARROW],
             status);
     addWeekDays(
             resource,
@@ -796,7 +783,7 @@ UnicodeString& RelativeDateTimeFormatter::format(
     int32_t bFuture = direction == UDAT_DIRECTION_NEXT ? 1 : 0;
     FieldPosition pos(FieldPosition::DONT_CARE);
     if (fOptBreakIterator == NULL) {
-        return fCache->relativeUnits[getStyleIndex(fStyle)][unit][bFuture].format(
+        return fCache->relativeUnits[fStyle][unit][bFuture].format(
             quantity,
             **fNumberFormat,
             **fPluralRules,
@@ -805,7 +792,7 @@ UnicodeString& RelativeDateTimeFormatter::format(
             status);
     }
     UnicodeString result;
-    fCache->relativeUnits[getStyleIndex(fStyle)][unit][bFuture].format(
+    fCache->relativeUnits[fStyle][unit][bFuture].format(
             quantity,
             **fNumberFormat,
             **fPluralRules,
@@ -827,9 +814,9 @@ UnicodeString& RelativeDateTimeFormatter::format(
         return appendTo;
     }
     if (fOptBreakIterator == NULL) {
-      return appendTo.append(fCache->absoluteUnits[getStyleIndex(fStyle)][unit][direction]);
+      return appendTo.append(fCache->absoluteUnits[fStyle][unit][direction]);
     }
-    UnicodeString result(fCache->absoluteUnits[getStyleIndex(fStyle)][unit][direction]);
+    UnicodeString result(fCache->absoluteUnits[fStyle][unit][direction]);
     adjustForContext(result);
     return appendTo.append(result);
 }

diff --git a/icu4c/source/i18n/sharedbreakiterator.cpp b/icu4c/source/i18n/sharedbreakiterator.cpp
index 8fa6010077f5f3b791714cb315884c6cd07f6d44..2da373d73ba1b469c2b0706ed8e84ea2c219bcd7 100644 (file)
--- a/icu4c/source/i18n/sharedbreakiterator.cpp
+++ b/icu4c/source/i18n/sharedbreakiterator.cpp
@@ -13,6 +13,9 @@
 
 U_NAMESPACE_BEGIN
 
+SharedBreakIterator::SharedBreakIterator(
+        BreakIterator *biToAdopt) : ptr(biToAdopt) { }
+
 SharedBreakIterator::~SharedBreakIterator() {
   delete ptr;
 }

diff --git a/icu4c/source/i18n/sharedbreakiterator.h b/icu4c/source/i18n/sharedbreakiterator.h
index cae34afd5bf1707542ab377b7c0f1f9eea30dfd2..ff3706eb0de0d7dbed56924d27e1674232692613 100644 (file)
--- a/icu4c/source/i18n/sharedbreakiterator.h
+++ b/icu4c/source/i18n/sharedbreakiterator.h
@@ -26,7 +26,7 @@ class BreakIterator;
 // these shared break iterators must never be exposed outside of that class.
 class U_I18N_API SharedBreakIterator : public SharedObject {
 public:
-    SharedBreakIterator(BreakIterator *biToAdopt) : ptr(biToAdopt) { }
+    SharedBreakIterator(BreakIterator *biToAdopt);
     virtual ~SharedBreakIterator();
 
     BreakIterator *get() const { return ptr; }

diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h
index e15e182caecd9c6ebc4b82353fa338dd926b8d2b..87e34ac55d85725d205f05f4e4bbb5d66d4d0419 100644 (file)
--- a/icu4c/source/i18n/unicode/reldatefmt.h
+++ b/icu4c/source/i18n/unicode/reldatefmt.h
@@ -55,7 +55,7 @@ typedef enum UDateRelativeDateTimeFormatterStyle {
    * @draft ICU 54
    */
   UDAT_STYLE_COUNT
-}; 
+} UDateRelativeDateTimeFormatterStyle; 
 
 /**
  * Represents the unit for formatting a relative date. e.g "in 5 days"