Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / icu / source / i18n / rbt_data.cpp

diff --git a/src/third_party/icu/source/i18n/rbt_data.cpp b/src/third_party/icu/source/i18n/rbt_data.cpp
index a414038..bdb7ead 100644 (file)
--- a/src/third_party/icu/source/i18n/rbt_data.cpp
+++ b/src/third_party/icu/source/i18n/rbt_data.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1999-2008, International Business Machines
+*   Copyright (C) 1999-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -28,7 +28,7 @@ TransliterationRuleData::TransliterationRuleData(UErrorCode& status)
     if (U_FAILURE(status)) {
         return;
     }
-    variableNames.setValueDeleter(uhash_deleteUnicodeString);
+    variableNames.setValueDeleter(uprv_deleteUObject);
     variables = 0;
     variablesLength = 0;
 }
@@ -41,7 +41,7 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData&
 {
     UErrorCode status = U_ZERO_ERROR;
     int32_t i = 0;
-    variableNames.setValueDeleter(uhash_deleteUnicodeString);
+    variableNames.setValueDeleter(uprv_deleteUObject);
     int32_t pos = -1;
     const UHashElement *e;
     while ((e = other.variableNames.nextElement(pos)) != 0) {
@@ -72,7 +72,7 @@ TransliterationRuleData::TransliterationRuleData(const TransliterationRuleData&
     }
     // Remove the array and exit if memory allocation error occured.
     if (U_FAILURE(status)) {
-        for (int32_t n = i-1; n >= 0; n--) {
+        for (int32_t n = i-1; n >= 0; n++) {
             delete variables[n];
         }
         uprv_free(variables);