Update ICU to 54.1 step 1

source/common/unormcmp.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2001-2011, International Business Machines
+*   Copyright (C) 2001-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  unormcmp.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2004sep13
 *   created by: Markus W. Scherer
@@ skipping 10 matching lines @@
 #include "unicode/unorm.h"
 #include "unicode/ustring.h"
 #include "cmemory.h"
 #include "normalizer2impl.h"
 #include "ucase.h"
 #include "uprops.h"
 #include "ustr_imp.h"
 
 U_NAMESPACE_USE
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* compare canonically equivalent ------------------------------------------- */
 
 /*
  * Compare two strings for canonical equivalence.
  * Further options include case-insensitive comparison and
  * code point order (as opposed to code unit order).
  *
  * In this function, canonical equivalence is optional as well.
  * If canonical equivalence is tested, then both strings must fulfill
  * the FCD check.
@@ skipping 551 matching lines @@
      *
      * Exception: When using the Turkic case-folding option, we do perform
      * full NFD first. This is because in the Turkic case precomposed characters
      * with 0049 capital I or 0069 small i fold differently whether they
      * are first decomposed or not, so an FCD check - a check only for
      * canonical order - is not sufficient.
      */
     if(!(options&UNORM_INPUT_IS_FCD) || (options&U_FOLD_CASE_EXCLUDE_SPECIAL_I)) {
         const Normalizer2 *n2;
         if(options&U_FOLD_CASE_EXCLUDE_SPECIAL_I) {
-            n2=Normalizer2Factory::getNFDInstance(*pErrorCode);
+            n2=Normalizer2::getNFDInstance(*pErrorCode);
         } else {
             n2=Normalizer2Factory::getFCDInstance(*pErrorCode);
         }
         if (U_FAILURE(*pErrorCode)) {
             return 0;
         }
 
         if(normOptions&UNORM_UNICODE_3_2) {
             const UnicodeSet *uni32=uniset_getUnicode32Instance(*pErrorCode);
             FilteredNormalizer2 fn2(*n2, *uni32);
@@ skipping 18 matching lines @@
     }
 
     if(U_SUCCESS(*pErrorCode)) {
         return unorm_cmpEquivFold(s1, length1, s2, length2, options, pErrorCode);
     } else {
         return 0;
     }
 }
 
 #endif /* #if !UCONFIG_NO_NORMALIZATION */