Update ICU to 54.1 step 1

source/test/intltest/selfmts.cpp

 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  * Copyright (C) 2010 , Yahoo! Inc. 
  ********************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "selfmts.h"
 #include "cmemory.h"
 #include "unicode/selfmt.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define SIMPLE_PATTERN_STRING                                                    "feminine {feminineVerbValue} other{otherVerbValue}"
 
 
 #define SELECT_PATTERN_DATA 4
 #define SELECT_SYNTAX_DATA 10
 #define EXP_FORMAT_RESULT_DATA 12
 #define NUM_OF_FORMAT_ARGS 3
 
 #define VERBOSE_INT(x) {logln("%s:%d:  int %s=%d\n", __FILE__, __LINE__, #x, (x));}
 #define VERBOSE_USTRING(text) {logln("%s:%d: UnicodeString %s(%d) = ", __FILE__, __LINE__, #text, text.length()); logln(UnicodeString(" \"")+text+UnicodeString("\";"));}
@@ skipping 148 matching lines @@
         "Key word-_",
         " Keyword-_",
         "Key*word-_",
         "*Keyword-_"
     };
 
     delete selFmt;
     selFmt = NULL;
 
     selFmt = new SelectFormat( SIMPLE_PATTERN , status); 
-    for (int32_t i = 0; i < LENGTHOF(keywords); i++ ){
+    for (int32_t i = 0; i < UPRV_LENGTHOF(keywords); i++ ){
         status = U_ZERO_ERROR;
         selFmt->format( keywords[i], result , ignore , status);
         if (!U_FAILURE(status)) {
             errln("ERROR: SelectFormat Unit test failed in format() with keyWord and with an invalid keyword as : "+
                   keywords[i]+" ("+u_errorName(status)+")");
         }
     }
 
     delete selFmt;
 }
@@ skipping 123 matching lines @@
         UnicodeString expected=UnicodeString("otherVerbValue");
         if( result1 != expected ){
             errln("ERROR: SelectFormat API test failed in format() with unexpected result with Formattable");
         }
     }
 
 
     delete selFmt1;
 }
 #endif /* #if !UCONFIG_NO_FORMATTING */