Update ICU to 54.1 step 1

source/i18n/compactdecimalformat.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2012, International Business Machines Corporation and    *
+* Copyright (C) 1997-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File COMPACTDECIMALFORMAT.CPP
 *
 ********************************************************************************
 */
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "charstr.h"
 #include "cstring.h"
 #include "digitlst.h"
 #include "mutex.h"
 #include "unicode/compactdecimalformat.h"
 #include "unicode/numsys.h"
 #include "unicode/plurrule.h"
 #include "unicode/ures.h"
 #include "ucln_in.h"
 #include "uhash.h"
 #include "umutex.h"
 #include "unicode/ures.h"
 #include "uresimp.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array) / sizeof((array)[0]))
-
 // Maps locale name to CDFLocaleData struct.
 static UHashtable* gCompactDecimalData = NULL;
 static UMutex gCompactDecimalMetaLock = U_MUTEX_INITIALIZER;
 
 U_NAMESPACE_BEGIN
 
 static const int32_t MAX_DIGITS = 15;
 static const char gOther[] = "other";
 static const char gLatnTag[] = "latn";
 static const char gNumberElementsTag[] = "NumberElements";
@@ skipping 720 matching lines @@
 // extracted. It is usually of form 'Pefix 000 suffix'.
 // populatePrefixSuffix returns the number of 0's found in formatStr
 // before the decimal point.
 // In the special case that formatStr contains only spaces for prefix
 // and suffix, populatePrefixSuffix returns log10Value + 1.
 static int32_t populatePrefixSuffix(
     const char* variant, int32_t log10Value, const UnicodeString& formatStr, UHashtable* result, UErrorCode& status) {
   if (U_FAILURE(status)) {
     return 0;
   }
-  int32_t firstIdx = formatStr.indexOf(kZero, LENGTHOF(kZero), 0);
+  int32_t firstIdx = formatStr.indexOf(kZero, UPRV_LENGTHOF(kZero), 0);
   // We must have 0's in format string.
   if (firstIdx == -1) {
     status = U_INTERNAL_PROGRAM_ERROR;
     return 0;
   }
-  int32_t lastIdx = formatStr.lastIndexOf(kZero, LENGTHOF(kZero), firstIdx);
+  int32_t lastIdx = formatStr.lastIndexOf(kZero, UPRV_LENGTHOF(kZero), firstIdx);
   CDFUnit* unit = createCDFUnit(variant, log10Value, result, status);
   if (U_FAILURE(status)) {
     return 0;
   }
   // Everything up to first 0 is the prefix
   unit->prefix = formatStr.tempSubString(0, firstIdx);
   fixQuotes(unit->prefix);
   // Everything beyond the last 0 is the suffix
   unit->suffix = formatStr.tempSubString(lastIdx + 1);
   fixQuotes(unit->suffix);
@@ skipping 156 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