| Index: source/i18n/unicode/region.h
|
| diff --git a/source/i18n/unicode/region.h b/source/i18n/unicode/region.h
|
| index c33681e7e79879c6a8d418c74ecc70057a68ae72..cb75234bf9b6196aa091508042703588e376a4e8 100644
|
| --- a/source/i18n/unicode/region.h
|
| +++ b/source/i18n/unicode/region.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| *******************************************************************************
|
| - * Copyright (C) 2014, International Business Machines Corporation and others.
|
| + * Copyright (C) 2014-2015, International Business Machines Corporation and others.
|
| * All Rights Reserved.
|
| *******************************************************************************
|
| */
|
| @@ -104,9 +104,9 @@ public:
|
| #ifndef U_HIDE_DRAFT_API
|
| /**
|
| * Returns an enumeration over the IDs of all known regions that match the given type.
|
| - * @draft ICU 51
|
| + * @draft ICU 55
|
| */
|
| - static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
|
| + static StringEnumeration* U_EXPORT2 getAvailable(URegionType type, UErrorCode &status);
|
| #endif /* U_HIDE_DRAFT_API */
|
|
|
| /**
|
| @@ -135,18 +135,18 @@ public:
|
| * any sub-regions. For example, calling this method with region "150" (Europe) returns an enumeration containing
|
| * the various sub regions of Europe - "039" (Southern Europe) - "151" (Eastern Europe) - "154" (Northern Europe)
|
| * and "155" (Western Europe).
|
| - * @draft ICU 51
|
| + * @draft ICU 55
|
| */
|
| - StringEnumeration* getContainedRegions() const;
|
| + StringEnumeration* getContainedRegions(UErrorCode &status) const;
|
|
|
| /**
|
| * Returns an enumeration over the IDs of all the regions that are children of this region anywhere in the region
|
| * hierarchy and match the given type. This API may return an empty enumeration if this region doesn't have any
|
| * sub-regions that match the given type. For example, calling this method with region "150" (Europe) and type
|
| * "URGN_TERRITORY" returns a set containing all the territories in Europe ( "FR" (France) - "IT" (Italy) - "DE" (Germany) etc. )
|
| - * @draft ICU 51
|
| + * @draft ICU 55
|
| */
|
| - StringEnumeration* getContainedRegions( URegionType type ) const;
|
| + StringEnumeration* getContainedRegions( URegionType type, UErrorCode &status ) const;
|
| #endif /* U_HIDE_DRAFT_API */
|
|
|
| /**
|
| @@ -160,9 +160,9 @@ public:
|
| * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
|
| * regions for this region. Returns null for a non-deprecated region. For example, calling this method with region
|
| * "SU" (Soviet Union) would return a list of the regions containing "RU" (Russia), "AM" (Armenia), "AZ" (Azerbaijan), etc...
|
| - * @draft ICU 51
|
| + * @draft ICU 55
|
| */
|
| - StringEnumeration* getPreferredValues() const;
|
| + StringEnumeration* getPreferredValues(UErrorCode &status) const;
|
| #endif /* U_HIDE_DRAFT_API */
|
|
|
| /**
|
|
|