ICU-511.27.tar.gz

[apple/icu.git] / icuSources / i18n / uplrule.cpp

diff --git a/icuSources/i18n/uplrule.cpp b/icuSources/i18n/uplrule.cpp
index d0020f90c481edf51e1a31c585e58aa9526cbd28..5f937965a36cc156edf87117f95c67da884cb731 100644 (file)
--- a/icuSources/i18n/uplrule.cpp
+++ b/icuSources/i18n/uplrule.cpp
@@ -1,6 +1,6 @@
 /*
 *****************************************************************************************
 /*
 *****************************************************************************************

-* Copyright (C) 2010 Apple Inc. All Rights Reserved.
+* Copyright (C) 2010-2011 Apple Inc. All Rights Reserved.

 *****************************************************************************************
 */
 
 *****************************************************************************************
 */
 


@@ -8,10 +8,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
 
 #if !UCONFIG_NO_FORMATTING
 

+#include "unicode/upluralrules.h"

 #include "unicode/uplrule.h"
 #include "unicode/uplrule.h"

-#include "unicode/plurrule.h"
-#include "unicode/locid.h"
-#include "unicode/unistr.h"

 
 U_NAMESPACE_USE
 
 
 U_NAMESPACE_USE
 


@@ -19,16 +17,13 @@ U_CAPI UPluralRules* U_EXPORT2
 uplrule_open(const char *locale,
               UErrorCode *status)
 {
 uplrule_open(const char *locale,
               UErrorCode *status)
 {

-    if (status == NULL || U_FAILURE(*status)) {
-        return 0;
-    }
-       return (UPluralRules*)PluralRules::forLocale(Locale(locale), *status);
+    return uplrules_open(locale, status);

 }
 
 U_CAPI void U_EXPORT2
 uplrule_close(UPluralRules *plrules)
 {
 }
 
 U_CAPI void U_EXPORT2
 uplrule_close(UPluralRules *plrules)
 {

-  delete (PluralRules*)plrules;
+    uplrules_close(plrules);

 }
 
 U_CAPI int32_t U_EXPORT2
 }
 
 U_CAPI int32_t U_EXPORT2


@@ -37,11 +32,7 @@ uplrule_select(const UPluralRules *plrules,
                UChar *keyword, int32_t capacity,
                UErrorCode *status)
 {
                UChar *keyword, int32_t capacity,
                UErrorCode *status)
 {

-    if (status == NULL || U_FAILURE(*status)) {
-        return 0;
-    }
-    UnicodeString result = ((PluralRules*)plrules)->select(number);
-       return result.extract(keyword, capacity, *status);
+    return uplrules_select(plrules, number, keyword, capacity, status);

 }
 
 U_CAPI int32_t U_EXPORT2
 }
 
 U_CAPI int32_t U_EXPORT2


@@ -50,11 +41,7 @@ uplrule_selectDouble(const UPluralRules *plrules,
                      UChar *keyword, int32_t capacity,
                      UErrorCode *status)
 {
                      UChar *keyword, int32_t capacity,
                      UErrorCode *status)
 {

-    if (status == NULL || U_FAILURE(*status)) {
-        return 0;
-    }
-    UnicodeString result = ((PluralRules*)plrules)->select(number);
-       return result.extract(keyword, capacity, *status);
+    return uplrules_select(plrules, number, keyword, capacity, status);

 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */