Update ICU to 54.1 step 1

source/samples/numfmt/main.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1999-2010, International Business Machines Corporation and
+ * Copyright (c) 1999-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
 #include "unicode/utypes.h"
 #include "unicode/unistr.h"
 #include "unicode/numfmt.h"
 #include "unicode/dcfmtsym.h"
 #include "unicode/decimfmt.h"
 #include "unicode/locid.h"
 #include "unicode/uclean.h"
 #include "util.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 extern "C" void capi();
 void cppapi();
 
 static void
 showCurrencyFormatting(UBool useICU26API);
 
 int main(int argc, char **argv) {
     printf("%s output is in UTF-8\n", argv[0]);
 
     printf("C++ API\n");
@@ skipping 115 matching lines @@
         UChar symbol[16];
     } currencyMap[]={
         { "USD", 2, 0.0, { 0x24, 0 } },
         { "GBP", 2, 0.0, { 0xa3, 0 } },
         { "EUR", 2, 0.0, { 0x20ac, 0 } },
         { "JPY", 0, 0.0, { 0xa5, 0 } }
     };
 
     int32_t i;
 
-    for(i=0; i<LENGTHOF(currencyMap); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(currencyMap); ++i) {
         if(strcmp(currency, currencyMap[i].currency)==0) {
             break;
         }
     }
-    if(i==LENGTHOF(currencyMap)) {
+    if(i==UPRV_LENGTHOF(currencyMap)) {
         // a more specific error code would be useful in a real application
         errorCode=U_UNSUPPORTED_ERROR;
         return;
     }
 
     // set the currency-related data into the caller's formatter
 
     nf.setMinimumFractionDigits(currencyMap[i].fractionDigits);
     nf.setMaximumFractionDigits(currencyMap[i].fractionDigits);
 
@@ skipping 56 matching lines @@
     NumberFormat *nf;
     int32_t i, j;
 
     UnicodeString output;
 
     UErrorCode errorCode;
 
     // TODO: Using printf() here assumes that the runtime encoding is ASCII-friendly
     // and can therefore be mixed with UTF-8
 
-    for(i=0; i<LENGTHOF(sampleLocaleIDs); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(sampleLocaleIDs); ++i) {
         printf("show currency formatting (method for %s) in the locale \"%s\"\n",
                 useICU26API ? "ICU 2.6" : "before ICU 2.6",
                 sampleLocaleIDs[i]);
 
         // get a currency formatter for this locale ID
         errorCode=U_ZERO_ERROR;
         nf=NumberFormat::createCurrencyInstance(sampleLocaleIDs[i], errorCode);
         if(U_FAILURE(errorCode)) {
             printf("NumberFormat::createCurrencyInstance(%s) failed - %s\n",
                     sampleLocaleIDs[i], u_errorName(errorCode));
             continue;
         }
 
-        for(j=0; j<LENGTHOF(sampleCurrencies); ++j) {
+        for(j=0; j<UPRV_LENGTHOF(sampleCurrencies); ++j) {
             printf("  - format currency \"%s\": ", sampleCurrencies[j]);
 
             // set the actual currency to be formatted
             if(useICU26API) {
                 setNumberFormatCurrency_2_6(*nf, sampleCurrencies[j], errorCode);
             } else {
                 setNumberFormatCurrency_2_4(*nf, sampleCurrencies[j], errorCode);
             }
             if(U_FAILURE(errorCode)) {
                 printf("setNumberFormatCurrency(%s) failed - %s\n",
                         sampleCurrencies[j], u_errorName(errorCode));
                 continue;
             }
 
             // output=formatted currency value
             output.remove();
             nf->format(12345678.93, output);
             output+=(UChar)0x0a; // '\n'
             uprintf(output);
         }
     }
 }