Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: source/i18n/uregion.cpp

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/i18n/uregex.cpp ('k') | source/i18n/usearch.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/i18n/uregion.cpp
diff --git a/source/i18n/uregion.cpp b/source/i18n/uregion.cpp
index 5e4ba4ca52852a0196a5978e12d66d7f7d40257f..58bd9d0a0cca4494a4b41e18eab2185e08d99904 100644
--- a/source/i18n/uregion.cpp
+++ b/source/i18n/uregion.cpp
@@ -1,6 +1,6 @@
/*
*****************************************************************************************
-* Copyright (C) 2013, International Business Machines Corporation and others.
+* Copyright (C) 2013-2015, International Business Machines Corporation and others.
* All Rights Reserved.
*****************************************************************************************
*/
@@ -12,6 +12,7 @@
#include "unicode/uregion.h"
#include "unicode/region.h"
#include "unicode/uenum.h"
+#include "unicode/strenum.h"
U_NAMESPACE_USE
@@ -33,7 +34,8 @@ uregion_getRegionFromNumericCode (int32_t code, UErrorCode *status)
U_CAPI UEnumeration* U_EXPORT2
uregion_getAvailable(URegionType type, UErrorCode *status)
{
- return uenum_openFromStringEnumeration( Region::getAvailable(type), status );
+ StringEnumeration* strenum = Region::getAvailable(type, *status);
+ return uenum_openFromStringEnumeration( strenum, status );
}
@@ -61,14 +63,16 @@ uregion_getContainingRegionOfType(const URegion* uregion, URegionType type)
U_CAPI UEnumeration* U_EXPORT2
uregion_getContainedRegions(const URegion* uregion, UErrorCode *status)
{
- return uenum_openFromStringEnumeration( ((Region*)uregion)->getContainedRegions(), status);
+ StringEnumeration* strenum = ((Region*)uregion)->getContainedRegions(*status);
+ return uenum_openFromStringEnumeration( strenum, status);
}
U_CAPI UEnumeration* U_EXPORT2
uregion_getContainedRegionsOfType(const URegion* uregion, URegionType type, UErrorCode *status)
{
- return uenum_openFromStringEnumeration( ((Region*)uregion)->getContainedRegions(type), status);
+ StringEnumeration* strenum = ((Region*)uregion)->getContainedRegions(type, *status);
+ return uenum_openFromStringEnumeration( strenum, status);
}
@@ -82,7 +86,8 @@ uregion_contains(const URegion* uregion, const URegion* otherRegion)
U_CAPI UEnumeration* U_EXPORT2
uregion_getPreferredValues(const URegion* uregion, UErrorCode *status)
{
- return uenum_openFromStringEnumeration( ((Region*)uregion)->getPreferredValues(), status);
+ StringEnumeration* strenum = ((Region*)uregion)->getPreferredValues(*status);
+ return uenum_openFromStringEnumeration( strenum, status);
}
« no previous file with comments | « source/i18n/uregex.cpp ('k') | source/i18n/usearch.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698