Update ICU to 54.1 step 1

source/common/ustrtrns.cpp

 /*
 ******************************************************************************
 *
-*   Copyright (C) 2001-2013, International Business Machines
+*   Copyright (C) 2001-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 * File ustrtrns.cpp
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   9/10/2001    Ram    Creation.
@@ skipping 12 matching lines @@
 #include "unicode/putil.h"
 #include "unicode/ustring.h"
 #include "unicode/utf.h"
 #include "unicode/utf8.h"
 #include "unicode/utf16.h"
 #include "cstring.h"
 #include "cmemory.h"
 #include "ustr_imp.h"
 #include "uassert.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 U_CAPI UChar* U_EXPORT2 
 u_strFromUTF32WithSub(UChar *dest,
                int32_t destCapacity,
                int32_t *pDestLength,
                const UChar32 *src,
                int32_t srcLength,
                UChar32 subchar, int32_t *pNumSubstitutions,
                UErrorCode *pErrorCode) {
     const UChar32 *srcLimit;
     UChar32 ch;
@@ skipping 327 matching lines @@
         case 0:
             return U_SENTINEL;
         /* no default branch to optimize switch()  - all values are covered */
         }
     } else {
         illegal=1; /* too few bytes left */
     }
 
     /* correct sequence - all trail bytes have (b7..b6)==(10)? */
     /* illegal is also set if count>=4 */
-    U_ASSERT(illegal || count<LENGTHOF(utf8_minLegal));
+    U_ASSERT(illegal || count<UPRV_LENGTHOF(utf8_minLegal));
     if(illegal || c<utf8_minLegal[count] || U_IS_SURROGATE(c)) {
         /* error handling */
         /* don't go beyond this sequence */
         s=*ps;
         while(count>0 && s<limit && U8_IS_TRAIL(*s)) {
             ++s;
             --count;
         }
         c=U_SENTINEL;
     }
@@ skipping 1242 matching lines @@
 
     reqLength+=(int32_t)(pDest - (uint8_t *)dest);
     if(pDestLength){
         *pDestLength = reqLength;
     }
 
     /* Terminate the buffer */
     u_terminateChars(dest, destCapacity, reqLength, pErrorCode);
     return dest;
 }