ICU 56 update step 1

source/i18n/compactdecimalformat.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2014, International Business Machines Corporation and    *
+* Copyright (C) 1997-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File COMPACTDECIMALFORMAT.CPP
 *
 ********************************************************************************
 */
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
@@ skipping 221 matching lines @@
 UBool
 CompactDecimalFormat::eqHelper(const CompactDecimalFormat& that) const {
   return uhash_equals(_unitsByVariant, that._unitsByVariant) && divisors_equal(_divisors, that._divisors) && (*_pluralRules == *that._pluralRules);
 }
 
 UnicodeString&
 CompactDecimalFormat::format(
     double number,
     UnicodeString& appendTo,
     FieldPosition& pos) const {
+  UErrorCode status = U_ZERO_ERROR;
+  return format(number, appendTo, pos, status);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+    double number,
+    UnicodeString& appendTo,
+    FieldPosition& pos,
+    UErrorCode &status) const {
+  if (U_FAILURE(status)) {
+    return appendTo;
+  }
   DigitList orig, rounded;
   orig.set(number);
   UBool isNegative;
-  UErrorCode status = U_ZERO_ERROR;
   _round(orig, rounded, isNegative, status);
   if (U_FAILURE(status)) {
     return appendTo;
   }
   double roundedDouble = rounded.getDouble();
   if (isNegative) {
     roundedDouble = -roundedDouble;
   }
   int32_t baseIdx = computeLog10(roundedDouble, TRUE);
   double numberToFormat = roundedDouble / _divisors[baseIdx];
@@ skipping 13 matching lines @@
     double /* number */,
     UnicodeString& appendTo,
     FieldPositionIterator* /* posIter */,
     UErrorCode& status) const {
   status = U_UNSUPPORTED_ERROR;
   return appendTo;
 }
 
 UnicodeString&
 CompactDecimalFormat::format(
+    int32_t number,
+    UnicodeString& appendTo,
+    FieldPosition& pos) const {
+  return format((double) number, appendTo, pos);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+    int32_t number,
+    UnicodeString& appendTo,
+    FieldPosition& pos,
+    UErrorCode &status) const {
+  return format((double) number, appendTo, pos, status);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
+    int32_t /* number */,
+    UnicodeString& appendTo,
+    FieldPositionIterator* /* posIter */,
+    UErrorCode& status) const {
+  status = U_UNSUPPORTED_ERROR;
+  return appendTo;
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
     int64_t number,
     UnicodeString& appendTo,
     FieldPosition& pos) const {
   return format((double) number, appendTo, pos);
 }
 
 UnicodeString&
 CompactDecimalFormat::format(
+    int64_t number,
+    UnicodeString& appendTo,
+    FieldPosition& pos,
+    UErrorCode &status) const {
+  return format((double) number, appendTo, pos, status);
+}
+
+UnicodeString&
+CompactDecimalFormat::format(
     int64_t /* number */,
     UnicodeString& appendTo,
     FieldPositionIterator* /* posIter */,
     UErrorCode& status) const {
   status = U_UNSUPPORTED_ERROR;
   return appendTo;
 }
 
 UnicodeString&
 CompactDecimalFormat::format(
@@ skipping 561 matching lines @@
   for (int32_t i = 0; i < MAX_DIGITS; ++i) {
     if (!otherUnits[i].isSet()) {
       result->divisors[i] = lastDivisor;
       definedInCLDR[i] = FALSE;
     } else {
       lastDivisor = result->divisors[i];
       definedInCLDR[i] = TRUE;
     }
   }
   // Iterate over each variant.
-  int32_t pos = -1;
+  int32_t pos = UHASH_FIRST;
   const UHashElement* element = uhash_nextElement(result->unitsByVariant, &pos);
   for (;element != NULL; element = uhash_nextElement(result->unitsByVariant, &pos)) {
     CDFUnit* units = (CDFUnit*) element->value.pointer;
     for (int32_t i = 0; i < MAX_DIGITS; ++i) {
       if (definedInCLDR[i]) {
         if (!units[i].isSet()) {
           units[i] = otherUnits[i];
         }
       } else {
         if (i == 0) {
@@ skipping 60 matching lines @@
     cdfUnit = (const CDFUnit*) uhash_get(table, cvariant.data());
   }
   if (cdfUnit == NULL) {
     cdfUnit = (const CDFUnit*) uhash_get(table, gOther);
   }
   return &cdfUnit[log10Value];
 }
 
 U_NAMESPACE_END
 #endif