ICU4.6 upgrade.

ICU4.6 syncs to Unicode6.0 and CLDR1.9.

Change-Id: I695558055cc139b42b71da9138f61d19bcbd9758

1 files changed, 23 insertions, 4 deletions

diff --git a/i18n/coll.cpp b/i18n/coll.cpp
index 86f423ed..83c7565a 100644
--- a/i18n/coll.cpp
+++ b/i18n/coll.cpp
@@ -1,7 +1,7 @@
 /*
  ******************************************************************************
- * Copyright (C) 1996-2009, International Business Machines Corporation and   *
- * others. All Rights Reserved.                                               *
+ * Copyright (C) 1996-2010, International Business Machines Corporation and
+ * others. All Rights Reserved.
  ******************************************************************************
  */
 
@@ -235,8 +235,8 @@ Collator::createUCollator(const char *loc,
     if (status && U_SUCCESS(*status) && hasService()) {
         Locale desiredLocale(loc);
         Collator *col = (Collator*)gService->get(desiredLocale, *status);
-        if (col && col->getDynamicClassID() == RuleBasedCollator::getStaticClassID()) {
-            RuleBasedCollator *rbc = (RuleBasedCollator *)col;
+        RuleBasedCollator *rbc;
+        if (col && (rbc = dynamic_cast<RuleBasedCollator *>(col))) {
             if (!rbc->dataIsOwned) {
                 result = ucol_safeClone(rbc->ucollator, NULL, NULL, status);
             } else {
@@ -833,6 +833,25 @@ Collator::getFunctionalEquivalent(const char* keyword, const Locale& locale,
     return Locale::createFromName(loc);
 }
 
+int32_t Collator::getReorderCodes(int32_t *dest,
+                                 int32_t destCapacity,
+                                 UErrorCode& status) const
+{
+    if (U_SUCCESS(status)) {
+        status = U_UNSUPPORTED_ERROR;
+    }
+    return 0;
+}
+
+void Collator::setReorderCodes(const int32_t *reorderCodes,
+                              int32_t reorderCodesLength,
+                              UErrorCode& status)
+{
+    if (U_SUCCESS(status)) {
+        status = U_UNSUPPORTED_ERROR;
+    }
+}
+
 // UCollator private data members ----------------------------------------
 
 /* This is useless information */