AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11240 ICU4C 54 API status promotion.

Browse Source 
X-SVN-Rev: 36454
This commit is contained in:
Yoshito Umaoka 2014-09-11 06:16:13 +00:00
parent f71e7b22bd
commit 02939804a5
14 changed files with 1361 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1818
icu4c/APIChangeReport.html
View File

File diff suppressed because it is too large Load Diff

4
icu4c/source/common/unicode/brkiter.h
View File

@ -302,7 +302,7 @@ public:
* returned break position.
* @see RuleBaseBreakIterator::getRuleStatus()
* @see UWordBreak
* @draft ICU 52
* @stable ICU 52
*/
virtual int32_t getRuleStatus() const;
@ -332,7 +332,7 @@ public:
* is the total number of status values that were available,
* not the reduced number that were actually returned.
* @see getRuleStatus
* @draft ICU 52
* @stable ICU 52
*/
virtual int32_t getRuleStatusVec(int32_t *fillInVec, int32_t capacity, UErrorCode &status);

4
icu4c/source/common/unicode/listformatter.h
View File

@ -65,13 +65,13 @@ class U_COMMON_API ListFormatter : public UObject{
/**
* Copy constructor.
* @draft ICU 52
* @stable ICU 52
*/
ListFormatter(const ListFormatter&);
/**
* Assignment operator.
* @draft ICU 52
* @stable ICU 52
*/
ListFormatter& operator=(const ListFormatter& other);

4
icu4c/source/i18n/unicode/dcfmtsym.h
View File

@ -193,7 +193,6 @@ public:
*/
DecimalFormatSymbols(UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Creates a DecimalFormatSymbols object with last-resort data.
* Intended for callers who cache the symbols data and
@ -207,10 +206,9 @@ public:
* @param status Input/output parameter, set to success or
* failure code upon return.
* @return last-resort symbols
* @draft ICU 52
* @stable ICU 52
*/
static DecimalFormatSymbols* createWithLastResortData(UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Copy constructor.

12
icu4c/source/i18n/unicode/fmtable.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2013, International Business Machines
* Copyright (C) 1997-2014, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -598,13 +598,12 @@ public:
*/
static UClassID U_EXPORT2 getStaticClassID();
#ifndef U_HIDE_DRAFT_API
/**
* Convert the UFormattable to a Formattable. Internally, this is a reinterpret_cast.
* @param fmt a valid UFormattable
* @return the UFormattable as a Formattable object pointer. This is an alias to the original
* UFormattable, and so is only valid while the original argument remains in scope.
* @draft ICU 52
* @stable ICU 52
*/
static inline Formattable *fromUFormattable(UFormattable *fmt);
@ -613,7 +612,7 @@ public:
* @param fmt a valid UFormattable
* @return the UFormattable as a Formattable object pointer. This is an alias to the original
* UFormattable, and so is only valid while the original argument remains in scope.
* @draft ICU 52
* @stable ICU 52
*/
static inline const Formattable *fromUFormattable(const UFormattable *fmt);
@ -621,7 +620,7 @@ public:
* Convert this object pointer to a UFormattable.
* @return this object as a UFormattable pointer. This is an alias to this object,
* and so is only valid while this object remains in scope.
* @draft ICU 52
* @stable ICU 52
*/
inline UFormattable *toUFormattable();
@ -629,10 +628,9 @@ public:
* Convert this object pointer to a UFormattable.
* @return this object as a UFormattable pointer. This is an alias to this object,
* and so is only valid while this object remains in scope.
* @draft ICU 52
* @stable ICU 52
*/
inline const UFormattable *toUFormattable() const;
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_DEPRECATED_API
/**

14
icu4c/source/i18n/unicode/region.h
View File

@ -101,13 +101,11 @@ public:
*/
static const Region* U_EXPORT2 getInstance (int32_t code, UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Returns an enumeration over the IDs of all known regions that match the given type.
* @draft ICU 51
* @stable ICU 51
*/
static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a pointer to the region that contains this region. Returns NULL if this region is code "001" (World)
@ -127,7 +125,6 @@ public:
*/
const Region* getContainingRegion(URegionType type) const;
#ifndef U_HIDE_DRAFT_API
/**
* Return an enumeration over the IDs of all the regions that are immediate children of this region in the
* region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two,
@ -135,7 +132,7 @@ 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
* @stable ICU 51
*/
StringEnumeration* getContainedRegions() const;
@ -144,10 +141,9 @@ public:
* 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
* @stable ICU 51
*/
StringEnumeration* getContainedRegions( URegionType type ) const;
#endif /* U_HIDE_DRAFT_API */
/**
* Returns true if this region contains the supplied other region anywhere in the region hierarchy.
@ -155,15 +151,13 @@ public:
*/
UBool contains(const Region &other) const;
#ifndef U_HIDE_DRAFT_API
/**
* 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
* @stable ICU 51
*/
StringEnumeration* getPreferredValues() const;
#endif /* U_HIDE_DRAFT_API */
/**
* Return this region's canonical region code.

7
icu4c/source/i18n/unicode/timezone.h
View File

@ -358,7 +358,6 @@ public:
static UnicodeString& U_EXPORT2 getCanonicalID(const UnicodeString& id,
UnicodeString& canonicalID, UBool& isSystemID, UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Converts a system time zone ID to an equivalent Windows time zone ID. For example,
* Windows time zone ID "Pacific Standard Time" is returned for input "America/Los_Angeles".
@ -379,7 +378,7 @@ public:
* @return A reference to the result (<code>winid</code>).
* @see getIDForWindowsID
*
* @draft ICU 52
* @stable ICU 52
*/
static UnicodeString& U_EXPORT2 getWindowsID(const UnicodeString& id,
UnicodeString& winid, UErrorCode& status);
@ -408,13 +407,11 @@ public:
* @return A reference to the result (<code>id</code>).
* @see getWindowsID
*
* @draft ICU 52
* @stable ICU 52
*/
static UnicodeString& U_EXPORT2 getIDForWindowsID(const UnicodeString& winid, const char* region,
UnicodeString& id, UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns true if the two TimeZones are equal. (The TimeZone version only compares
* IDs, but subclasses are expected to also compare the fields they add.)

15
icu4c/source/i18n/unicode/ucal.h
View File

@ -755,7 +755,7 @@ ucal_setTimeZone(UCalendar* cal,
* @return The total buffer size needed; if greater than resultLength, the output was truncated.
* @stable ICU 51
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucal_getTimeZoneID(const UCalendar *cal,
UChar *result,
int32_t resultLength,
@ -1491,11 +1491,10 @@ typedef enum UTimeZoneTransitionType UTimeZoneTransitionType; /**< @stable ICU 5
* otherwise.
* @stable ICU 50
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
ucal_getTimeZoneTransitionDate(const UCalendar* cal, UTimeZoneTransitionType type,
UDate* transition, UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Converts a system time zone ID to an equivalent Windows time zone ID. For example,
* Windows time zone ID "Pacific Standard Time" is returned for input "America/Los_Angeles".
@ -1518,9 +1517,9 @@ ucal_getTimeZoneTransitionDate(const UCalendar* cal, UTimeZoneTransitionType typ
* @return The result string length, not including the terminating null.
* @see ucal_getTimeZoneIDForWindowsID
*
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucal_getWindowsTimeZoneID(const UChar* id, int32_t len,
UChar* winid, int32_t winidCapacity, UErrorCode* status);
@ -1550,14 +1549,12 @@ ucal_getWindowsTimeZoneID(const UChar* id, int32_t len,
* @return The result string length, not including the terminating null.
* @see ucal_getWindowsTimeZoneID
*
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucal_getTimeZoneIDForWindowsID(const UChar* winid, int32_t len, const char* region,
UChar* id, int32_t idCapacity, UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

63
icu4c/source/i18n/unicode/uformattable.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 2013, International Business Machines Corporation and others.
* Copyright (C) 2013-2014, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@ -32,8 +32,6 @@
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/localpointer.h"
/**
@ -41,7 +39,7 @@
* Practically, this indicates which of the getters would return without conversion
* or error.
* @see icu::Formattable::Type
* @draft ICU 52
* @stable ICU 52
*/
typedef enum UFormattableType {
UFMT_DATE = 0, /**< ufmt_getDate() will return without conversion. @see ufmt_getDate*/
@ -59,7 +57,7 @@ typedef enum UFormattableType {
* Opaque type representing various types of data which may be used for formatting
* and parsing operations.
* @see icu::Formattable
* @draft ICU 52
* @stable ICU 52
*/
typedef void *UFormattable;
@ -68,21 +66,21 @@ typedef void *UFormattable;
* may return error if memory allocation failed.
* parameter status error code.
* See {@link unum_parseToUFormattable} for example code.
* @draft ICU 52
* @stable ICU 52
* @return the new UFormattable
* @see ufmt_close
* @see icu::Formattable::Formattable()
*/
U_DRAFT UFormattable* U_EXPORT2
U_STABLE UFormattable* U_EXPORT2
ufmt_open(UErrorCode* status);
/**
* Cleanup any additional memory allocated by this UFormattable.
* @param fmt the formatter
* @draft ICU 52
* @stable ICU 52
* @see ufmt_open
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ufmt_close(UFormattable* fmt);
#if U_SHOW_CPLUSPLUS_API
@ -96,7 +94,7 @@ U_NAMESPACE_BEGIN
*
* @see LocalPointerBase
* @see LocalPointer
* @draft ICU 52
* @stable ICU 52
*/
U_DEFINE_LOCAL_OPEN_POINTER(LocalUFormattablePointer, UFormattable, ufmt_close);
@ -112,9 +110,9 @@ U_NAMESPACE_END
* @return the value as a UFormattableType
* @see ufmt_isNumeric
* @see icu::Formattable::getType() const
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UFormattableType U_EXPORT2
U_STABLE UFormattableType U_EXPORT2
ufmt_getType(const UFormattable* fmt, UErrorCode *status);
/**
@ -123,9 +121,9 @@ ufmt_getType(const UFormattable* fmt, UErrorCode *status);
* @return true if the object is a double, long, or int64 value, else false.
* @see ufmt_getType
* @see icu::Formattable::isNumeric() const
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
ufmt_isNumeric(const UFormattable* fmt);
/**
@ -135,10 +133,10 @@ ufmt_isNumeric(const UFormattable* fmt);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
* @return the value
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getDate(UErrorCode&) const
*/
U_DRAFT UDate U_EXPORT2
U_STABLE UDate U_EXPORT2
ufmt_getDate(const UFormattable* fmt, UErrorCode *status);
/**
@ -153,10 +151,10 @@ ufmt_getDate(const UFormattable* fmt, UErrorCode *status);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
* @return the value
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getDouble(UErrorCode&) const
*/
U_DRAFT double U_EXPORT2
U_STABLE double U_EXPORT2
ufmt_getDouble(UFormattable* fmt, UErrorCode *status);
/**
@ -174,10 +172,10 @@ ufmt_getDouble(UFormattable* fmt, UErrorCode *status);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
* @return the value
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getLong(UErrorCode&) const
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ufmt_getLong(UFormattable* fmt, UErrorCode *status);
@ -195,10 +193,10 @@ ufmt_getLong(UFormattable* fmt, UErrorCode *status);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
* @return the value
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getInt64(UErrorCode&) const
*/
U_DRAFT int64_t U_EXPORT2
U_STABLE int64_t U_EXPORT2
ufmt_getInt64(UFormattable* fmt, UErrorCode *status);
/**
@ -208,10 +206,10 @@ ufmt_getInt64(UFormattable* fmt, UErrorCode *status);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
* @return the value as a const void*. It is a polymorphic C++ object.
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getObject() const
*/
U_DRAFT const void *U_EXPORT2
U_STABLE const void *U_EXPORT2
ufmt_getObject(const UFormattable* fmt, UErrorCode *status);
/**
@ -223,10 +221,10 @@ ufmt_getObject(const UFormattable* fmt, UErrorCode *status);
* @param status the error code - any conversion or format errors
* @param len if non null, contains the string length on return
* @return the null terminated string value - must not be referenced after any other functions are called on this UFormattable.
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getString(UnicodeString&)const
*/
U_DRAFT const UChar* U_EXPORT2
U_STABLE const UChar* U_EXPORT2
ufmt_getUChars(UFormattable* fmt, int32_t *len, UErrorCode *status);
/**
@ -234,10 +232,10 @@ ufmt_getUChars(UFormattable* fmt, int32_t *len, UErrorCode *status);
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors. U_ILLEGAL_ARGUMENT_ERROR if not an array type.
* @return the number of array objects or undefined if not an array type
* @draft ICU 52
* @stable ICU 52
* @see ufmt_getArrayItemByIndex
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status);
/**
@ -246,10 +244,10 @@ ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status);
* @param n the number of the array to return (0 based).
* @param status the error code - any conversion or format errors. Returns an error if n is out of bounds.
* @return the nth array value, only valid while the containing UFormattable is valid. NULL if not an array.
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getArray(int32_t&, UErrorCode&) const
*/
U_DRAFT UFormattable * U_EXPORT2
U_STABLE UFormattable * U_EXPORT2
ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status);
/**
@ -271,12 +269,11 @@ ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status);
* @param len if non-null, on exit contains the string length (not including the terminating null)
* @param status the error code
* @return the character buffer as a NULL terminated string, which is owned by the object and must not be accessed if any other functions are called on this object.
* @draft ICU 52
* @stable ICU 52
* @see icu::Formattable::getDecimalNumber(UErrorCode&)
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif

12
icu4c/source/i18n/unicode/unum.h
View File

@ -580,7 +580,6 @@ unum_formatDoubleCurrency(const UNumberFormat* fmt,
UFieldPosition* pos,
UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Format a UFormattable into a string.
* @param fmt the formatter to use
@ -599,16 +598,15 @@ unum_formatDoubleCurrency(const UNumberFormat* fmt,
* @return the total buffer size needed; if greater than resultLength,
* the output was truncated. Will return 0 on error.
* @see unum_parseToUFormattable
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
unum_formatUFormattable(const UNumberFormat* fmt,
const UFormattable *number,
UChar *result,
int32_t resultLength,
UFieldPosition *pos,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Parse a string into an integer using a UNumberFormat.
@ -744,7 +742,6 @@ unum_parseDoubleCurrency(const UNumberFormat* fmt,
UChar* currency,
UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Parse a UChar string into a UFormattable.
* Example code:
@ -761,16 +758,15 @@ unum_parseDoubleCurrency(const UNumberFormat* fmt,
* @return the UFormattable. Will be ==result unless NULL was passed in for result, in which case it will be the newly opened UFormattable.
* @see ufmt_getType
* @see ufmt_close
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UFormattable* U_EXPORT2
U_STABLE UFormattable* U_EXPORT2
unum_parseToUFormattable(const UNumberFormat* fmt,
UFormattable *result,
const UChar* text,
int32_t textLength,
int32_t* parsePos, /* 0 = start */
UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
/**
* Set the pattern used by a UNumberFormat. This can only be used

44
icu4c/source/i18n/unicode/unumsys.h
View File

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 2013, International Business Machines
* Copyright (C) 2013-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -34,14 +34,12 @@
* numbers locale keyword.
*/
#ifndef U_HIDE_DRAFT_API
/**
* Opaque UNumberingSystem object for use in C programs.
* @draft ICU 52
* @stable ICU 52
*/
struct UNumberingSystem;
typedef struct UNumberingSystem UNumberingSystem; /**< C typedef for struct UNumberingSystem. @draft ICU 52 */
typedef struct UNumberingSystem UNumberingSystem; /**< C typedef for struct UNumberingSystem. @stable ICU 52 */
/**
* Opens a UNumberingSystem object using the default numbering system for the specified
@ -52,9 +50,9 @@ typedef struct UNumberingSystem UNumberingSystem; /**< C typedef for struct UNu
* specifies a numbering system unknown to ICU.
* @return A UNumberingSystem for the specified locale, or NULL if an error
* occurred.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UNumberingSystem * U_EXPORT2
U_STABLE UNumberingSystem * U_EXPORT2
unumsys_open(const char *locale, UErrorCode *status);
/**
@ -73,17 +71,17 @@ unumsys_open(const char *locale, UErrorCode *status);
* is unknown to ICU.
* @return A UNumberingSystem for the specified name, or NULL if an error
* occurred.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UNumberingSystem * U_EXPORT2
U_STABLE UNumberingSystem * U_EXPORT2
unumsys_openByName(const char *name, UErrorCode *status);
/**
* Close a UNumberingSystem object. Once closed it may no longer be used.
* @param unumsys The UNumberingSystem object to close.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
unumsys_close(UNumberingSystem *unumsys);
#if U_SHOW_CPLUSPLUS_API
@ -95,7 +93,7 @@ U_NAMESPACE_BEGIN
* For most methods see the LocalPointerBase base class.
* @see LocalPointerBase
* @see LocalPointer
* @draft ICU 52
* @stable ICU 52
*/
U_DEFINE_LOCAL_OPEN_POINTER(LocalUNumberingSystemPointer, UNumberingSystem, unumsys_close);
@ -108,9 +106,9 @@ U_NAMESPACE_END
* @param status A pointer to a UErrorCode to receive any errors.
* @return A pointer to a UEnumeration that must be closed with uenum_close(),
* or NULL if an error occurred.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UEnumeration * U_EXPORT2
U_STABLE UEnumeration * U_EXPORT2
unumsys_openAvailableNames(UErrorCode *status);
/**
@ -120,9 +118,9 @@ unumsys_openAvailableNames(UErrorCode *status);
* @return A pointer to the name of the specified UNumberingSystem object, or
* NULL if the name is not one of the ICU predefined names. The pointer
* is only valid for the lifetime of the UNumberingSystem object.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const char * U_EXPORT2
U_STABLE const char * U_EXPORT2
unumsys_getName(const UNumberingSystem *unumsys);
/**
@ -131,9 +129,9 @@ unumsys_getName(const UNumberingSystem *unumsys);
* @param unumsys The UNumberingSystem whose algorithmic status is desired.
* @return TRUE if the specified UNumberingSystem object is for an algorithmic
* system.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
unumsys_isAlgorithmic(const UNumberingSystem *unumsys);
/**
@ -142,9 +140,9 @@ unumsys_isAlgorithmic(const UNumberingSystem *unumsys);
* hexadecimal. The radix is less well-defined for non-positional algorithmic systems.
* @param unumsys The UNumberingSystem whose radix is desired.
* @return The radix of the specified UNumberingSystem object.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
unumsys_getRadix(const UNumberingSystem *unumsys);
/**
@ -161,14 +159,12 @@ unumsys_getRadix(const UNumberingSystem *unumsys);
* @param status A pointer to a UErrorCode to receive any errors.
* @return The total buffer size needed; if greater than resultLength, the
* output was truncated.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
unumsys_getDescription(const UNumberingSystem *unumsys, UChar *result,
int32_t resultLength, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

59
icu4c/source/i18n/unicode/uregion.h
View File

@ -114,14 +114,12 @@ typedef enum URegionType {
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
/**
* Opaque URegion object for use in C programs.
* @draft ICU 52
* @stable ICU 52
*/
struct URegion;
typedef struct URegion URegion; /**< @draft ICU 52 */
typedef struct URegion URegion; /**< @stable ICU 52 */
/**
* Returns a pointer to a URegion for the specified region code: A 2-letter or 3-letter ISO 3166
@ -129,41 +127,41 @@ typedef struct URegion URegion; /**< @draft ICU 52 */
* Code as defined by the LDML specification. The code will be canonicalized internally. If the
* region code is NULL or not recognized, the appropriate error code will be set
* (U_ILLEGAL_ARGUMENT_ERROR).
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const URegion* U_EXPORT2
U_STABLE const URegion* U_EXPORT2
uregion_getRegionFromCode(const char *regionCode, UErrorCode *status);
/**
* Returns a pointer to a URegion for the specified numeric region code. If the numeric region
* code is not recognized, the appropriate error code will be set (U_ILLEGAL_ARGUMENT_ERROR).
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const URegion* U_EXPORT2
U_STABLE const URegion* U_EXPORT2
uregion_getRegionFromNumericCode (int32_t code, UErrorCode *status);
/**
* Returns an enumeration over the canonical codes of all known regions that match the given type.
* The enumeration must be closed with with uenum_close().
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UEnumeration* U_EXPORT2
U_STABLE UEnumeration* U_EXPORT2
uregion_getAvailable(URegionType type, UErrorCode *status);
/**
* Returns true if the specified uregion is equal to the specified otherRegion.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
uregion_areEqual(const URegion* uregion, const URegion* otherRegion);
/**
* Returns a pointer to the URegion that contains the specified uregion. Returns NULL if the
* specified uregion is code "001" (World) or "ZZ" (Unknown region). For example, calling
* this method with region "IT" (Italy) returns the URegion for "039" (Southern Europe).
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const URegion* U_EXPORT2
U_STABLE const URegion* U_EXPORT2
uregion_getContainingRegion(const URegion* uregion);
/**
@ -173,9 +171,9 @@ uregion_getContainingRegion(const URegion* uregion);
* is URGN_GROUPING, URGN_DEPRECATED, or URGN_UNKNOWN which are not appropriate for this API.
* For example, calling this method with uregion "IT" (Italy) for type URGN_CONTINENT returns the
* URegion "150" (Europe).
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const URegion* U_EXPORT2
U_STABLE const URegion* U_EXPORT2
uregion_getContainingRegionOfType(const URegion* uregion, URegionType type);
/**
@ -186,9 +184,9 @@ uregion_getContainingRegionOfType(const URegion* uregion, URegionType type);
* this function for uregion "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). The enumeration must be closed with with uenum_close().
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UEnumeration* U_EXPORT2
U_STABLE UEnumeration* U_EXPORT2
uregion_getContainedRegions(const URegion* uregion, UErrorCode *status);
/**
@ -198,17 +196,17 @@ uregion_getContainedRegions(const URegion* uregion, UErrorCode *status);
* For example, calling this method with region "150" (Europe) and type URGN_TERRITORY" returns an
* enumeration containing all the territories in Europe: "FR" (France), "IT" (Italy), "DE" (Germany),
* etc. The enumeration must be closed with with uenum_close().
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UEnumeration* U_EXPORT2
U_STABLE UEnumeration* U_EXPORT2
uregion_getContainedRegionsOfType(const URegion* uregion, URegionType type, UErrorCode *status);
/**
* Returns true if the specified uregion contains the specified otherRegion anywhere in the region
* hierarchy.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
uregion_contains(const URegion* uregion, const URegion* otherRegion);
/**
@ -217,34 +215,33 @@ uregion_contains(const URegion* uregion, const URegion* otherRegion);
* uregion is not deprecated, returns NULL. For example, calling this method with uregion
* "SU" (Soviet Union) returns a list of the regions containing "RU" (Russia), "AM" (Armenia),
* "AZ" (Azerbaijan), etc... The enumeration must be closed with with uenum_close().
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT UEnumeration* U_EXPORT2
U_STABLE UEnumeration* U_EXPORT2
uregion_getPreferredValues(const URegion* uregion, UErrorCode *status);
/**
* Returns the specified uregion's canonical code.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT const char* U_EXPORT2
U_STABLE const char* U_EXPORT2
uregion_getRegionCode(const URegion* uregion);
/**
* Returns the specified uregion's numeric code, or a negative value if there is no numeric code
* for the specified uregion.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
uregion_getNumericCode(const URegion* uregion);
/**
* Returns the URegionType of the specified uregion.
* @draft ICU 52
* @stable ICU 52
*/
U_DRAFT URegionType U_EXPORT2
U_STABLE URegionType U_EXPORT2
uregion_getType(const URegion* uregion);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */

18
icu4c/source/i18n/unicode/uspoof.h
View File

@ -971,7 +971,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
UErrorCode *status);
#endif /* U_SHOW_CPLUSPLUS_API */
#ifndef U_HIDE_DRAFT_API
/**
* Get the set of Candidate Characters for Inclusion in Identifiers, as defined
* in Unicode UAX #31, http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers
@ -981,9 +980,9 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
*
* @param status The error code, set if a problem occurs while creating the set.
*
* @draft ICU 51
* @stable ICU 51
*/
U_DRAFT const USet * U_EXPORT2
U_STABLE const USet * U_EXPORT2
uspoof_getInclusionSet(UErrorCode *status);
/**
@ -995,9 +994,9 @@ uspoof_getInclusionSet(UErrorCode *status);
*
* @param status The error code, set if a problem occurs while creating the set.
*
* @draft ICU 51
* @stable ICU 51
*/
U_DRAFT const USet * U_EXPORT2
U_STABLE const USet * U_EXPORT2
uspoof_getRecommendedSet(UErrorCode *status);
#if U_SHOW_CPLUSPLUS_API
@ -1011,9 +1010,9 @@ uspoof_getRecommendedSet(UErrorCode *status);
*
* @param status The error code, set if a problem occurs while creating the set.
*
* @draft ICU 51
* @stable ICU 51
*/
U_DRAFT const icu::UnicodeSet * U_EXPORT2
U_STABLE const icu::UnicodeSet * U_EXPORT2
uspoof_getInclusionUnicodeSet(UErrorCode *status);
/**
@ -1025,13 +1024,12 @@ uspoof_getInclusionUnicodeSet(UErrorCode *status);
*
* @param status The error code, set if a problem occurs while creating the set.
*
* @draft ICU 51
* @stable ICU 51
*/
U_DRAFT const icu::UnicodeSet * U_EXPORT2
U_STABLE const icu::UnicodeSet * U_EXPORT2
uspoof_getRecommendedUnicodeSet(UErrorCode *status);
#endif /* U_SHOW_CPLUSPLUS_API */
#endif /* U_HIDE_DRAFT_API */
/**
* Serialize the data for a spoof detector into a chunk of memory.

2
icu4c/source/layout/LEFontInstance.h
View File

@ -186,7 +186,7 @@ public:
* @param length - ignored on entry, on exit will be the length of the table if known, or -1 if unknown.
* @return the address of the table in memory, or <code>NULL</code>
* if the table doesn't exist.
* @draft ICU 52
* @deprecated ICU 54. See {@link LayoutEngine}
*/
virtual const void* getFontTable(LETag tableTag, size_t &length) const { length=-1; return getFontTable(tableTag); } /* -1 = unknown length */