Update ICU to 54.1 step 1

source/common/caniter.cpp

 /*
  *****************************************************************************
- * Copyright (C) 1996-2011, International Business Machines Corporation and  *
- * others. All Rights Reserved.                                              *
+ * Copyright (C) 1996-2014, International Business Machines Corporation and
+ * others. All Rights Reserved.
  *****************************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_NORMALIZATION
 
 #include "unicode/caniter.h"
 #include "unicode/normalizer2.h"
 #include "unicode/uchar.h"
@@ skipping 49 matching lines @@
 
 /**
  *@param source string to get results for
  */
 CanonicalIterator::CanonicalIterator(const UnicodeString &sourceStr, UErrorCode &status) :
     pieces(NULL),
     pieces_length(0),
     pieces_lengths(NULL),
     current(NULL),
     current_length(0),
-    nfd(*Normalizer2Factory::getNFDInstance(status)),
+    nfd(*Normalizer2::getNFDInstance(status)),
     nfcImpl(*Normalizer2Factory::getNFCImpl(status))
 {
     if(U_SUCCESS(status) && nfcImpl.ensureCanonIterData(status)) {
       setSource(sourceStr, status);
     }
 }
 
 CanonicalIterator::~CanonicalIterator() {
   cleanPieces();
 }
@@ skipping 483 matching lines @@
     if(U_FAILURE(status) || trial.compare(segment+segmentPos, segLen - segmentPos) != 0) {
         return NULL;
     }
 
     return getEquivalents2(fillinResult, temp.getBuffer()+inputLen, temp.length()-inputLen, status);
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_NORMALIZATION */