organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-12083 Update APIs for 57m1

Browse source 
X-SVN-Rev: 38251
This commit is contained in:
Michael Ow 2016-02-02 05:42:06 +00:00
parent d63bc540ec
commit 367ded24ef
14 changed files with 313 additions and 1458 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1634
icu4c/APIChangeReport.html
View file

File diff suppressed because it is too large Load diff

10
icu4c/source/common/unicode/localpointer.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2009-2015, International Business Machines
* Copyright (C) 2009-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -191,7 +191,6 @@ public:
* @stable ICU 4.4
*/
explicit LocalPointer(T *p=NULL) : LocalPointerBase<T>(p) {}
#ifndef U_HIDE_DRAFT_API
/**
* Constructor takes ownership and reports an error if NULL.
*
@ -203,13 +202,14 @@ public:
* @param p simple pointer to an object that is adopted
* @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR
* if p==NULL and no other failure code had been set
* @draft ICU 55
* @stable ICU 55
*/
LocalPointer(T *p, UErrorCode &errorCode) : LocalPointerBase<T>(p) {
if(p==NULL && U_SUCCESS(errorCode)) {
errorCode=U_MEMORY_ALLOCATION_ERROR;
}
}
#ifndef U_HIDE_DRAFT_API
#if U_HAVE_RVALUE_REFERENCES
/**
* Move constructor, leaves src with isNull().
@ -286,7 +286,6 @@ public:
delete LocalPointerBase<T>::ptr;
LocalPointerBase<T>::ptr=p;
}
#ifndef U_HIDE_DRAFT_API
/**
* Deletes the object it owns,
* and adopts (takes ownership of) the one passed in.
@ -300,7 +299,7 @@ public:
* @param p simple pointer to an object that is adopted
* @param errorCode in/out UErrorCode, set to U_MEMORY_ALLOCATION_ERROR
* if p==NULL and no other failure code had been set
* @draft ICU 55
* @stable ICU 55
*/
void adoptInsteadAndCheckErrorCode(T *p, UErrorCode &errorCode) {
if(U_SUCCESS(errorCode)) {
@ -313,7 +312,6 @@ public:
delete p;
}
}
#endif /* U_HIDE_DRAFT_API */
};
/**

1
icu4c/source/common/unicode/simpleformatter.h
View file

@ -51,6 +51,7 @@ class U_COMMON_API SimpleFormatter U_FINAL : public UMemory {
public:
/**
* Default constructor.
* @draft ICU 57
*/
SimpleFormatter() : compiledPattern((UChar)0) {}

4
icu4c/source/common/unicode/uconfig.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2015, International Business Machines
* Copyright (C) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uconfig.h
@ -286,7 +286,7 @@
* This is not possible on EBCDIC platforms
* because they need ibm-37 or ibm-1047 default converters.
*
* @draft ICU 55
* @stable ICU 55
*/
#ifndef UCONFIG_ONLY_HTML_CONVERSION
# define UCONFIG_ONLY_HTML_CONVERSION 0

20
icu4c/source/common/unicode/ulistformatter.h
View file

@ -1,6 +1,6 @@
/*
*****************************************************************************************
* Copyright (C) 2015, International Business Machines
* Copyright (C) 2015-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*****************************************************************************************
*/
@ -11,7 +11,6 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/localpointer.h"
@ -27,10 +26,10 @@
/**
* Opaque UListFormatter object for use in C
* @draft ICU 55
* @stable ICU 55
*/
struct UListFormatter;
typedef struct UListFormatter UListFormatter; /**< C typedef for struct UListFormatter. @draft ICU 55 */
typedef struct UListFormatter UListFormatter; /**< C typedef for struct UListFormatter. @stable ICU 55 */
/**
* Open a new UListFormatter object using the rules for a given locale.
@ -46,9 +45,9 @@ typedef struct UListFormatter UListFormatter; /**< C typedef for struct UListFo
* @return
* A pointer to a UListFormatter object for the specified locale,
* or NULL if an error occurred.
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT UListFormatter* U_EXPORT2
U_STABLE UListFormatter* U_EXPORT2
ulistfmt_open(const char* locale,
UErrorCode* status);
@ -56,9 +55,9 @@ ulistfmt_open(const char* locale,
* Close a UListFormatter object. Once closed it may no longer be used.
* @param listfmt
* The UListFormatter object to close.
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ulistfmt_close(UListFormatter *listfmt);
@ -73,7 +72,7 @@ U_NAMESPACE_BEGIN
*
* @see LocalPointerBase
* @see LocalPointer
* @draft ICU 55
* @stable ICU 55
*/
U_DEFINE_LOCAL_OPEN_POINTER(LocalUListFormatterPointer, UListFormatter, ulistfmt_close);
@ -113,7 +112,7 @@ U_NAMESPACE_END
* The total buffer size needed; if greater than resultLength, the
* output was truncated. May be <=0 if unable to determine the
* total buffer size needed (e.g. for illegal arguments).
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
ulistfmt_format(const UListFormatter* listfmt,
@ -124,7 +123,6 @@ ulistfmt_format(const UListFormatter* listfmt,
int32_t resultCapacity,
UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

8
icu4c/source/common/unicode/utypes.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1996-2015, International Business Machines
* Copyright (C) 1996-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -649,10 +649,8 @@ typedef enum UErrorCode {
U_REGEX_STACK_OVERFLOW, /**< Regular expression backtrack stack overflow. */
U_REGEX_TIME_OUT, /**< Maximum allowed match time exceeded */
U_REGEX_STOPPED_BY_CALLER, /**< Matching operation aborted by user callback fn. */
#ifndef U_HIDE_DRAFT_API
U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */
U_REGEX_INVALID_CAPTURE_GROUP_NAME, /**< Invalid capture group name. @draft ICU 55 */
#endif /* U_HIDE_DRAFT_API */
U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @stable ICU 55 */
U_REGEX_INVALID_CAPTURE_GROUP_NAME, /**< Invalid capture group name. @stable ICU 55 */
U_REGEX_ERROR_LIMIT=U_REGEX_STOPPED_BY_CALLER+3, /**< This must always be the last value to indicate the limit for regexp errors */
/*

10
icu4c/source/i18n/unicode/datefmt.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2015, International Business Machines
* Copyright (C) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -586,7 +586,6 @@ public:
UErrorCode &status);
#endif /* U_HIDE_INTERNAL_API */
#ifndef U_HIDE_DRAFT_API
/**
* Creates a date/time formatter for the given skeleton and
* default locale.
@ -598,7 +597,7 @@ public:
* order for that locale.
* @param status Any error returned here.
* @return A date/time formatter which the caller owns.
* @draft ICU 55
* @stable ICU 55
*/
static DateFormat* U_EXPORT2 createInstanceForSkeleton(
const UnicodeString& skeleton,
@ -615,7 +614,7 @@ public:
* @param locale The given locale.
* @param status Any error returned here.
* @return A date/time formatter which the caller owns.
* @draft ICU 55
* @stable ICU 55
*/
static DateFormat* U_EXPORT2 createInstanceForSkeleton(
const UnicodeString& skeleton,
@ -634,7 +633,7 @@ public:
* @param locale The given locale.
* @param status Any error returned here.
* @return A date/time formatter which the caller owns.
* @draft ICU 55
* @stable ICU 55
*/
static DateFormat* U_EXPORT2 createInstanceForSkeleton(
Calendar *calendarToAdopt,
@ -642,7 +641,6 @@ public:
const Locale &locale,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Gets the set of locales for which DateFormats are installed.

8
icu4c/source/i18n/unicode/dtfmtsym.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2015, International Business Machines
* Copyright (C) 1997-2016, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -423,22 +423,20 @@ public:
static const UChar ALTERNATE_TIME_SEPARATOR = 0x002e; // '.'
#endif /* U_HIDE_INTERNAL_API */
#ifndef U_HIDE_DRAFT_API
/**
* Gets the time separator string. For example: ":".
* @param result Output param which will receive the time separator string.
* @return A reference to 'result'.
* @draft ICU 55
* @stable ICU 55
*/
UnicodeString& getTimeSeparatorString(UnicodeString& result) const;
/**
* Sets the time separator string. For example: ":".
* @param newTimeSeparator the new time separator string.
* @draft ICU 55
* @stable ICU 55
*/
void setTimeSeparatorString(const UnicodeString& newTimeSeparator);
#endif /* U_HIDE_DRAFT_API */
/**
* Gets cyclic year name strings if the calendar has them, by width and context.

4
icu4c/source/i18n/unicode/measfmt.h
View file

@ -186,7 +186,6 @@ class U_I18N_API MeasureFormat : public Format {
FieldPosition &pos,
UErrorCode &status) const;
#ifndef U_HIDE_DRAFT_API
/**
* Formats a single measure per unit. An example of such a
* formatted string is 3.5 meters per second.
@ -198,7 +197,7 @@ class U_I18N_API MeasureFormat : public Format {
* @param status the error.
* @return appendTo reference
*
* @draft ICU 55
* @stable ICU 55
*/
UnicodeString &formatMeasurePerUnit(
const Measure &measure,
@ -207,7 +206,6 @@ class U_I18N_API MeasureFormat : public Format {
FieldPosition &pos,
UErrorCode &status) const;
#endif /* U_HIDE_DRAFT_API */
/**
* Return a formatter for CurrencyAmount objects in the given

8
icu4c/source/i18n/unicode/regex.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2015, International Business Machines
* Copyright (C) 2002-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: regex.h
@ -450,7 +450,7 @@ public:
* @param groupName The capture group name.
* @param status A UErrorCode to receive any errors.
*
* @draft ICU 55
* @stable ICU 55
*/
virtual int32_t groupNumberFromName(const UnicodeString &groupName, UErrorCode &status) const;
@ -469,7 +469,7 @@ public:
* nul-terminated.
* @param status A UErrorCode to receive any errors.
*
* @draft ICU 55
* @stable ICU 55
*/
virtual int32_t groupNumberFromName(const char *groupName, int32_t nameLength, UErrorCode &status) const;
@ -849,7 +849,7 @@ public:
* position may not be valid with the altered input string.</p>
* @param status A reference to a UErrorCode to receive any errors.
* @return TRUE if a match is found.
* @draft ICU 55
* @stable ICU 55
*/
virtual UBool find(UErrorCode &status);

12
icu4c/source/i18n/unicode/region.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2014-2015, International Business Machines Corporation and others.
* Copyright (C) 2014-2016, International Business Machines Corporation and others.
* All Rights Reserved.
*******************************************************************************
*/
@ -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 55
* @stable ICU 55
*/
static StringEnumeration* U_EXPORT2 getAvailable(URegionType type, UErrorCode &status);
#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 55
* @stable ICU 55
*/
StringEnumeration* getContainedRegions(UErrorCode &status) 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 55
* @stable ICU 55
*/
StringEnumeration* getContainedRegions( URegionType type, UErrorCode &status ) const;
#endif /* U_HIDE_DRAFT_API */
/**
* Returns true if this region contains the supplied other region anywhere in the region hierarchy.

20
icu4c/source/i18n/unicode/scientificnumberformatter.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2014, International Business Machines
* Copyright (c) 2014-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -11,7 +11,6 @@
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/unistr.h"
@ -45,7 +44,7 @@ class Formattable;
* fmt->format(1.23456e-78, appendTo, status);
* </pre>
*
* @draft ICU 55
* @stable ICU 55
*/
class U_I18N_API ScientificNumberFormatter : public UObject {
public:
@ -58,7 +57,7 @@ public:
* @param status error returned here.
* @return The new ScientificNumberFormatter instance.
*
* @draft ICU 55
* @stable ICU 55
*/
static ScientificNumberFormatter *createSuperscriptInstance(
DecimalFormat *fmtToAdopt, UErrorCode &status);
@ -70,7 +69,7 @@ public:
* @param status error returned here.
* @return The ScientificNumberFormatter instance.
*
* @draft ICU 55
* @stable ICU 55
*/
static ScientificNumberFormatter *createSuperscriptInstance(
const Locale &locale, UErrorCode &status);
@ -86,7 +85,7 @@ public:
* @param status error returned here.
* @return The new ScientificNumberFormatter instance.
*
* @draft ICU 55
* @stable ICU 55
*/
static ScientificNumberFormatter *createMarkupInstance(
DecimalFormat *fmtToAdopt,
@ -103,7 +102,7 @@ public:
* @param status error returned here.
* @return The ScientificNumberFormatter instance.
*
* @draft ICU 55
* @stable ICU 55
*/
static ScientificNumberFormatter *createMarkupInstance(
const Locale &locale,
@ -114,7 +113,7 @@ public:
/**
* Returns a copy of this object. Caller must free returned copy.
* @draft ICU 55
* @stable ICU 55
*/
ScientificNumberFormatter *clone() const {
return new ScientificNumberFormatter(*this);
@ -122,7 +121,7 @@ public:
/**
* Destructor.
* @draft ICU 55
* @stable ICU 55
*/
virtual ~ScientificNumberFormatter();
@ -134,7 +133,7 @@ public:
* @param status any error returned here.
* @return appendTo
*
* @draft ICU 55
* @stable ICU 55
*/
UnicodeString &format(
const Formattable &number,
@ -216,7 +215,6 @@ public:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif /* !UCONFIG_NO_FORMATTING */
#endif

20
icu4c/source/i18n/unicode/udat.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2015, International Business Machines
* Copyright (C) 1996-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@ -761,15 +761,13 @@ typedef enum UDateFormatField {
UDAT_RELATED_YEAR_FIELD = 34,
#endif /* U_HIDE_INTERNAL_API */
#ifndef U_HIDE_DRAFT_API
/**
* FieldPosition and UFieldPosition selector for time separator,
* no corresponding UCAL_ field. No pattern character is currently
* defined for this.
* @draft ICU 55
* @stable ICU 55
*/
UDAT_TIME_SEPARATOR_FIELD = 35,
#endif /* U_HIDE_DRAFT_API */
/**
* Number of FieldPosition and UFieldPosition selectors for
@ -978,7 +976,6 @@ udat_format( const UDateFormat* format,
UFieldPosition* position,
UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Format a date using an UDateFormat.
* The date will be formatted using the conventions specified in {@link #udat_open }
@ -999,9 +996,9 @@ udat_format( const UDateFormat* format,
* @see udat_format
* @see udat_parseCalendar
* @see UFieldPosition
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
udat_formatCalendar( const UDateFormat* format,
UCalendar* calendar,
UChar* result,
@ -1034,9 +1031,9 @@ udat_formatCalendar( const UDateFormat* format,
* The total buffer size needed; if greater than resultLength, the output was truncated.
* @see udat_parse
* @see UFieldPositionIterator
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
udat_formatForFields( const UDateFormat* format,
UDate dateToFormat,
UChar* result,
@ -1072,9 +1069,9 @@ udat_formatForFields( const UDateFormat* format,
* @see udat_format
* @see udat_parseCalendar
* @see UFieldPositionIterator
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
udat_formatCalendarForFields( const UDateFormat* format,
UCalendar* calendar,
UChar* result,
@ -1082,7 +1079,6 @@ udat_formatCalendarForFields( const UDateFormat* format,
UFieldPositionIterator* fpositer,
UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
/**
* Parse a string into an date/time using a UDateFormat.

12
icu4c/source/i18n/unicode/uregex.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2004-2015, International Business Machines
* Copyright (C) 2004-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uregex.h
@ -607,7 +607,6 @@ U_STABLE int32_t U_EXPORT2
uregex_groupCount(URegularExpression *regexp,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Get the group number corresponding to a named capture group.
* The returned number can be used with any function that access
@ -622,9 +621,9 @@ uregex_groupCount(URegularExpression *regexp,
* nul-terminated string.
* @param status A pointer to a UErrorCode to receive any errors.
*
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
uregex_groupNumberFromName(URegularExpression *regexp,
const UChar *groupName,
int32_t nameLength,
@ -646,14 +645,13 @@ uregex_groupNumberFromName(URegularExpression *regexp,
* nul-terminated.
* @param status A pointer to a UErrorCode to receive any errors.
*
* @draft ICU 55
* @stable ICU 55
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
uregex_groupNumberFromCName(URegularExpression *regexp,
const char *groupName,
int32_t nameLength,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/** Extract the string for the specified matching expression or subexpression.
* Group #0 is the complete string of matched text.