organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-9955 merge ICU4C API status promotion to trunk

Browse source 
X-SVN-Rev: 33306
This commit is contained in:
Michael Ow 2013-02-22 20:15:50 +00:00
parent a22744bd41
commit 37eeb709db
22 changed files with 93 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -546,7 +546,7 @@ public:
* @param status Receives errors detected by this function.
* @return *this
*
* @draft ICU 49
* @stable ICU 49
*/
virtual BreakIterator &refreshInputText(UText *input, UErrorCode &status) = 0;

12
icu4c/source/common/unicode/icudataver.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2009-2012, International Business Machines
* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -18,14 +18,13 @@
#include "unicode/utypes.h"
#ifndef U_HIDE_DRAFT_API
/**
* @draft ICU 49
* @stable ICU 49
*/
#define U_ICU_VERSION_BUNDLE "icuver"
/**
* @draft ICU 49
* @stable ICU 49
*/
#define U_ICU_DATA_KEY "DataVersion"
@ -35,9 +34,8 @@
* @param dataVersionFillin icuver data version information to be filled in if not-null
* @param status stores the error code from the calls to resource bundle
*
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
U_STABLE void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status);
#endif

6
icu4c/source/common/unicode/locid.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1996-2012, International Business Machines
* Copyright (C) 1996-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -450,7 +450,6 @@ public:
*/
int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const;
#ifndef U_HIDE_DRAFT_API
/**
* Sets the value for a keyword.
*
@ -460,10 +459,9 @@ public:
* that keyword does not exist.
* @param status Returns any error information while performing this operation.
*
* @draft ICU 49
* @stable ICU 49
*/
void setKeywordValue(const char* keywordName, const char* keywordValue, UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* returns the locale's three-letter language code, as specified

26
icu4c/source/common/unicode/normalizer2.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2009-2012, International Business Machines
* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -83,7 +83,6 @@ public:
*/
~Normalizer2();
#ifndef U_HIDE_DRAFT_API
/**
* Returns a Normalizer2 instance for Unicode NFC normalization.
* Same as getInstance(NULL, "nfc", UNORM2_COMPOSE, errorCode).
@ -93,7 +92,7 @@ public:
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
static const Normalizer2 *
getNFCInstance(UErrorCode &errorCode);
@ -107,7 +106,7 @@ public:
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
static const Normalizer2 *
getNFDInstance(UErrorCode &errorCode);
@ -121,7 +120,7 @@ public:
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
static const Normalizer2 *
getNFKCInstance(UErrorCode &errorCode);
@ -135,7 +134,7 @@ public:
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
static const Normalizer2 *
getNFKDInstance(UErrorCode &errorCode);
@ -149,11 +148,10 @@ public:
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
static const Normalizer2 *
getNFKCCasefoldInstance(UErrorCode &errorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a Normalizer2 instance which uses the specified data file
@ -290,7 +288,7 @@ public:
* @param decomposition String object which will be set to c's
* raw decomposition mapping, if there is one.
* @return TRUE if c has a decomposition, otherwise FALSE
* @draft ICU 49
* @stable ICU 49
*/
virtual UBool
getRawDecomposition(UChar32 c, UnicodeString &decomposition) const;
@ -308,7 +306,7 @@ public:
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
* @draft ICU 49
* @stable ICU 49
*/
virtual UChar32
composePair(UChar32 a, UChar32 b) const;
@ -319,7 +317,7 @@ public:
* but all standard implementations return the Unicode Canonical_Combining_Class value.
* @param c code point
* @return c's combining class
* @draft ICU 49
* @stable ICU 49
*/
virtual uint8_t
getCombiningClass(UChar32 c) const;
@ -540,7 +538,7 @@ public:
* @param decomposition String object which will be set to c's
* raw decomposition mapping, if there is one.
* @return TRUE if c has a decomposition, otherwise FALSE
* @draft ICU 49
* @stable ICU 49
*/
virtual UBool
getRawDecomposition(UChar32 c, UnicodeString &decomposition) const;
@ -553,7 +551,7 @@ public:
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
* @draft ICU 49
* @stable ICU 49
*/
virtual UChar32
composePair(UChar32 a, UChar32 b) const;
@ -564,7 +562,7 @@ public:
* but all standard implementations return the Unicode Canonical_Combining_Class value.
* @param c code point
* @return c's combining class
* @draft ICU 49
* @stable ICU 49
*/
virtual uint8_t
getCombiningClass(UChar32 c) const;

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

@ -1,6 +1,6 @@
/*
***************************************************************************
* Copyright (C) 1999-2012 International Business Machines Corporation *
* Copyright (C) 1999-2013 International Business Machines Corporation *
* and others. All rights reserved. *
***************************************************************************
@ -654,7 +654,7 @@ public:
* @param status Receives errors detected by this function.
* @return *this
*
* @draft ICU 49
* @stable ICU 49
*/
virtual RuleBasedBreakIterator &refreshInputText(UText *input, UErrorCode &status);

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

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1996-2012, International Business Machines Corporation and others.
* Copyright (C) 1996-2013, International Business Machines Corporation and others.
* All Rights Reserved.
******************************************************************************
*/
@ -500,7 +500,6 @@ ubrk_getRuleStatusVec(UBreakIterator *bi, int32_t *fillInVec, int32_t capacity,
U_STABLE const char* U_EXPORT2
ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Set the subject text string upon which the break iterator is operating
* without changing any other aspect of the state.
@ -524,13 +523,12 @@ ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCo
* @param text The new (moved) text string.
* @param status Receives errors detected by this function.
*
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT void U_EXPORT2
U_STABLE void U_EXPORT2
ubrk_refreshUText(UBreakIterator *bi,
UText *text,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2012, International Business Machines
* Copyright (C) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* file name: uconfig.h
@ -96,7 +96,7 @@
* utypes.h includes those headers if this macro is defined to 0.
* Otherwise, each those headers must be included explicitly when using one of their macros.
* Defaults to 0 for backward compatibility, except inside ICU.
* @draft ICU 49
* @stable ICU 49
*/
#ifdef U_NO_DEFAULT_INCLUDE_UTF_HEADERS
/* Use the predefined value. */

12
icu4c/source/common/unicode/uidna.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2012, International Business Machines
* Copyright (C) 2003-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -96,7 +96,6 @@ enum {
* @stable ICU 4.6
*/
UIDNA_NONTRANSITIONAL_TO_UNICODE=0x20,
#ifndef U_HIDE_DRAFT_API
/**
* IDNA option to check for whether the input conforms to the CONTEXTO rules.
* For use in static worker and factory methods.
@ -104,10 +103,9 @@ enum {
* (The CONTEXTO check is new in IDNA2008.)
* <p>This is for use by registries for IDNA2008 conformance.
* UTS #46 does not require the CONTEXTO check.
* @draft ICU 49
* @stable ICU 49
*/
UIDNA_CHECK_CONTEXTO=0x40
#endif /* U_HIDE_DRAFT_API */
};
/**
@ -490,21 +488,19 @@ enum {
* @stable ICU 4.6
*/
UIDNA_ERROR_CONTEXTJ=0x1000,
#ifndef U_HIDE_DRAFT_API
/**
* A label does not meet the IDNA CONTEXTO requirements for punctuation characters.
* Some punctuation characters "Would otherwise have been DISALLOWED"
* but are allowed in certain contexts. (RFC 5892)
* @draft ICU 49
* @stable ICU 49
*/
UIDNA_ERROR_CONTEXTO_PUNCTUATION=0x2000,
/**
* A label does not meet the IDNA CONTEXTO requirements for digits.
* Arabic-Indic Digits (U+066x) must not be mixed with Extended Arabic-Indic Digits (U+06Fx).
* @draft ICU 49
* @stable ICU 49
*/
UIDNA_ERROR_CONTEXTO_DIGITS=0x4000
#endif /* U_HIDE_DRAFT_API */
};
/* IDNA2003 API ------------------------------------------------------------- */

6
icu4c/source/common/unicode/unistr.h
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1998-2012, International Business Machines
* Copyright (C) 1998-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -142,7 +142,7 @@ class UnicodeStringAppendable; // unicode/appendable.h
* This can be defined to be empty or "explicit".
* If explicit, then the UnicodeString(UChar) and UnicodeString(UChar32)
* constructors are marked as explicit, preventing their inadvertent use.
* @draft ICU 49
* @stable ICU 49
*/
#ifndef UNISTR_FROM_CHAR_EXPLICIT
# if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)
@ -162,7 +162,7 @@ class UnicodeStringAppendable; // unicode/appendable.h
*
* In particular, this helps prevent accidentally depending on ICU conversion code
* by passing a string literal into an API with a const UnicodeString & parameter.
* @draft ICU 49
* @stable ICU 49
*/
#ifndef UNISTR_FROM_STRING_EXPLICIT
# if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION)

38
icu4c/source/common/unicode/unorm2.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2009-2012, International Business Machines
* Copyright (C) 2009-2013, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -118,7 +118,6 @@ typedef struct UNormalizer2 UNormalizer2; /**< C typedef for struct UNormalizer
#if !UCONFIG_NO_NORMALIZATION
#ifndef U_HIDE_DRAFT_API
/**
* Returns a UNormalizer2 instance for Unicode NFC normalization.
* Same as unorm2_getInstance(NULL, "nfc", UNORM2_COMPOSE, pErrorCode).
@ -128,9 +127,9 @@ typedef struct UNormalizer2 UNormalizer2; /**< C typedef for struct UNormalizer
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT const UNormalizer2 * U_EXPORT2
U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFCInstance(UErrorCode *pErrorCode);
/**
@ -142,9 +141,9 @@ unorm2_getNFCInstance(UErrorCode *pErrorCode);
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT const UNormalizer2 * U_EXPORT2
U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFDInstance(UErrorCode *pErrorCode);
/**
@ -156,9 +155,9 @@ unorm2_getNFDInstance(UErrorCode *pErrorCode);
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT const UNormalizer2 * U_EXPORT2
U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKCInstance(UErrorCode *pErrorCode);
/**
@ -170,9 +169,9 @@ unorm2_getNFKCInstance(UErrorCode *pErrorCode);
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT const UNormalizer2 * U_EXPORT2
U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKDInstance(UErrorCode *pErrorCode);
/**
@ -184,11 +183,10 @@ unorm2_getNFKDInstance(UErrorCode *pErrorCode);
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the requested Normalizer2, if successful
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT const UNormalizer2 * U_EXPORT2
U_STABLE const UNormalizer2 * U_EXPORT2
unorm2_getNFKCCasefoldInstance(UErrorCode *pErrorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a UNormalizer2 instance which uses the specified data file
@ -355,7 +353,6 @@ unorm2_getDecomposition(const UNormalizer2 *norm2,
UChar32 c, UChar *decomposition, int32_t capacity,
UErrorCode *pErrorCode);
#ifndef U_HIDE_DRAFT_API
/**
* Gets the raw decomposition mapping of c.
*
@ -383,9 +380,9 @@ unorm2_getDecomposition(const UNormalizer2 *norm2,
* immediately. Check for U_FAILURE() on output or use with
* function chaining. (See User Guide for details.)
* @return the non-negative length of c's raw decomposition, if there is one; otherwise a negative value
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
unorm2_getRawDecomposition(const UNormalizer2 *norm2,
UChar32 c, UChar *decomposition, int32_t capacity,
UErrorCode *pErrorCode);
@ -403,9 +400,9 @@ unorm2_getRawDecomposition(const UNormalizer2 *norm2,
* @param a A (normalization starter) code point.
* @param b Another code point.
* @return The non-negative composite code point if there is one; otherwise a negative value.
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT UChar32 U_EXPORT2
U_STABLE UChar32 U_EXPORT2
unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b);
/**
@ -415,11 +412,10 @@ unorm2_composePair(const UNormalizer2 *norm2, UChar32 a, UChar32 b);
* @param norm2 UNormalizer2 instance
* @param c code point
* @return c's combining class
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT uint8_t U_EXPORT2
U_STABLE uint8_t U_EXPORT2
unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c);
#endif /* U_HIDE_DRAFT_API */
/**
* Tests if the string is normalized.

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

@ -456,7 +456,6 @@ uscript_getShortName(UScriptCode scriptCode);
U_STABLE UScriptCode U_EXPORT2
uscript_getScript(UChar32 codepoint, UErrorCode *err);
#ifndef U_HIDE_DRAFT_API
/**
* Do the Script_Extensions of code point c contain script sc?
* If c does not have explicit Script_Extensions, then this tests whether
@ -470,9 +469,9 @@ uscript_getScript(UChar32 codepoint, UErrorCode *err);
* @param c code point
* @param sc script code
* @return TRUE if sc is in Script_Extensions(c)
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT UBool U_EXPORT2
U_STABLE UBool U_EXPORT2
uscript_hasScript(UChar32 c, UScriptCode sc);
/**
@ -504,13 +503,12 @@ uscript_hasScript(UChar32 c, UScriptCode sc);
* function chaining. (See User Guide for details.)
* @return number of script codes in c's Script_Extensions, or 1 for the single Script value,
* written to scripts unless U_BUFFER_OVERFLOW_ERROR indicates insufficient capacity
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
uscript_getScriptExtensions(UChar32 c,
UScriptCode *scripts, int32_t capacity,
UErrorCode *errorCode);
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_DRAFT_API

14
icu4c/source/i18n/unicode/calendar.h
View file

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2012, International Business Machines
* Copyright (C) 1997-2013, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*
@ -898,7 +898,6 @@ public:
*/
UBool isLenient(void) const;
#ifndef U_HIDE_DRAFT_API
/**
* Sets the behavior for handling wall time repeating multiple times
* at negative time zone offset transitions. For example, 1:30 AM on
@ -917,7 +916,7 @@ public:
* @param option the behavior for handling repeating wall time, either
* <code>UCAL_WALLTIME_FIRST</code> or <code>UCAL_WALLTIME_LAST</code>.
* @see #getRepeatedWallTimeOption
* @draft ICU 49
* @stable ICU 49
*/
void setRepeatedWallTimeOption(UCalendarWallTimeOption option);
@ -928,7 +927,7 @@ public:
* @return the behavior for handling repeating wall time, either
* <code>UCAL_WALLTIME_FIRST</code> or <code>UCAL_WALLTIME_LAST</code>.
* @see #setRepeatedWallTimeOption
* @draft ICU 49
* @stable ICU 49
*/
UCalendarWallTimeOption getRepeatedWallTimeOption(void) const;
@ -951,7 +950,7 @@ public:
* <code>UCAL_WALLTIME_NEXT_VALID</code>.
* @see #getSkippedWallTimeOption
*
* @draft ICU 49
* @stable ICU 49
*/
void setSkippedWallTimeOption(UCalendarWallTimeOption option);
@ -963,10 +962,9 @@ public:
* <code>UCAL_WALLTIME_FIRST</code>, <code>UCAL_WALLTIME_LAST</code>
* and <code>UCAL_WALLTIME_NEXT_VALID</code>.
* @see #setSkippedWallTimeOption
* @draft ICU 49
* @stable ICU 49
*/
UCalendarWallTimeOption getSkippedWallTimeOption(void) const;
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_DEPRECATED_API
/**
@ -1371,7 +1369,7 @@ public:
* \endcode
*
* @return legacy calendar type name string
* @draft ICU 49
* @stable ICU 49
*/
virtual const char * getType() const = 0;

2
icu4c/source/i18n/unicode/decimfmt.h
View file

@ -1229,7 +1229,7 @@ public:
* @return if parse succeeds, a pointer to a newly-created CurrencyAmount
* object (owned by the caller) containing information about
* the parsed currency; if parse fails, this is NULL.
* @draft ICU 49
* @stable ICU 49
*/
virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
ParsePosition& pos) const;

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

@ -1,5 +1,5 @@
/*
* Copyright (C) 1997-2012, International Business Machines Corporation and others.
* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@ -477,7 +477,7 @@ public:
* For more details see the Calendar::getType() documentation.
*
* @return legacy calendar type name string
* @draft ICU 49
* @stable ICU 49
*/
virtual const char * getType() const;

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

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2012, International Business Machines Corporation and others.
* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@ -641,7 +641,7 @@ public:
* @return if parse succeeds, a pointer to a newly-created CurrencyAmount
* object (owned by the caller) containing information about
* the parsed currency; if parse fails, this is NULL.
* @draft ICU 49
* @stable ICU 49
*/
virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
ParsePosition& pos) const;

6
icu4c/source/i18n/unicode/numsys.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2010-2011, International Business Machines Corporation and
* Copyright (C) 2010-2013, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -122,14 +122,12 @@ public:
*/
int32_t getRadix();
#ifndef U_HIDE_DRAFT_API
/**
* Returns the name of this numbering system if it was created using one of the predefined names
* known to ICU. Otherwise, returns NULL.
* @draft ICU 4.6
* @stable ICU 4.6
*/
const char * getName();
#endif /* U_HIDE_DRAFT_API */
/**
* Returns the description string of this numbering system, which is either

6
icu4c/source/i18n/unicode/rbnf.h
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1997-2012, International Business Machines Corporation and others.
* Copyright (C) 1997-2013, International Business Machines Corporation and others.
* All Rights Reserved.
*******************************************************************************
*/
@ -970,7 +970,7 @@ public:
* symbolsToAdopt; the client must not delete it.
*
* @param symbolsToAdopt DecimalFormatSymbols to be adopted.
* @draft ICU 49
* @stable ICU 49
*/
virtual void adoptDecimalFormatSymbols(DecimalFormatSymbols* symbolsToAdopt);
@ -981,7 +981,7 @@ public:
* deleting it.
*
* @param symbols DecimalFormatSymbols.
* @draft ICU 49
* @stable ICU 49
*/
virtual void setDecimalFormatSymbols(const DecimalFormatSymbols& symbols);

6
icu4c/source/i18n/unicode/timezone.h
View file

@ -1,5 +1,5 @@
/*************************************************************************
* Copyright (c) 1997-2012, International Business Machines Corporation
* Copyright (c) 1997-2013, International Business Machines Corporation
* and others. All Rights Reserved.
**************************************************************************
*
@ -133,7 +133,6 @@ public:
*/
virtual ~TimeZone();
#ifndef U_HIDE_DRAFT_API
/**
* Returns the "unknown" time zone.
* It behaves like the GMT/UTC time zone but has the
@ -144,10 +143,9 @@ public:
* @see UCAL_UNKNOWN_ZONE_ID
* @see createTimeZone
* @see getGMT
* @draft ICU 49
* @stable ICU 49
*/
static const TimeZone& U_EXPORT2 getUnknown();
#endif /* U_HIDE_DRAFT_API */
/**
* The GMT (=UTC) time zone has a raw offset of zero and does not use daylight

24
icu4c/source/i18n/unicode/ucal.h
View file

@ -877,22 +877,19 @@ enum UCalendarAttribute {
* Minimum number of days in first week
* @stable ICU 2.0
*/
UCAL_MINIMAL_DAYS_IN_FIRST_WEEK
#ifndef U_HIDE_DRAFT_API
,
UCAL_MINIMAL_DAYS_IN_FIRST_WEEK,
/**
* The behavior for handling wall time repeating multiple times
* at negative time zone offset transitions
* @draft ICU 49
* @stable ICU 49
*/
UCAL_REPEATED_WALL_TIME,
/**
* The behavior for handling skipped wall time at positive time
* zone offset transitions.
* @draft ICU 49
* @stable ICU 49
*/
UCAL_SKIPPED_WALL_TIME
#endif /* U_HIDE_DRAFT_API */
};
/** @stable ICU 2.0 */
@ -901,34 +898,31 @@ typedef enum UCalendarAttribute UCalendarAttribute;
/**
* Options for handling ambiguous wall time at time zone
* offset transitions.
* @draft ICU 49
* @stable ICU 49
*/
enum UCalendarWallTimeOption {
/**
* An ambiguous wall time to be interpreted as the latest.
* This option is valid for UCAL_REPEATED_WALL_TIME and
* UCAL_SKIPPED_WALL_TIME.
* @draft ICU 49
* @stable ICU 49
*/
UCAL_WALLTIME_LAST
#ifndef U_HIDE_DRAFT_API
,
UCAL_WALLTIME_LAST,
/**
* An ambiguous wall time to be interpreted as the earliest.
* This option is valid for UCAL_REPEATED_WALL_TIME and
* UCAL_SKIPPED_WALL_TIME.
* @draft ICU 49
* @stable ICU 49
*/
UCAL_WALLTIME_FIRST,
/**
* An ambiguous wall time to be interpreted as the next valid
* wall time. This option is valid for UCAL_SKIPPED_WALL_TIME.
* @draft ICU 49
* @stable ICU 49
*/
UCAL_WALLTIME_NEXT_VALID
#endif /* U_HIDE_DRAFT_API */
};
/** @draft ICU 49 */
/** @stable ICU 49 */
typedef enum UCalendarWallTimeOption UCalendarWallTimeOption;
/**

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

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2002-2012, International Business Machines
* Copyright (c) 2002-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -343,7 +343,6 @@ ucurr_getKeywordValuesForLocale(const char* key,
UBool commonlyUsed,
UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Returns the ISO 4217 numeric code for the currency.
* <p>Note: If the ISO 4217 numeric code is not assigned for the currency or
@ -351,11 +350,10 @@ ucurr_getKeywordValuesForLocale(const char* key,
*
* @param currency null-terminated 3-letter ISO 4217 code
* @return The ISO 4217 numeric code of the currency
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
ucurr_getNumericCode(const UChar* currency);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */

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

@ -721,7 +721,7 @@ typedef enum UDateFormatField {
* corresponding to cyclic year names. This is implemented
* using the {@link #UCAL_YEAR} field. This displays
* the cyclic year name, if available.
* @draft ICU 49
* @stable ICU 49
*/
UDAT_YEAR_NAME_FIELD = 30,

12
icu4c/source/io/unicode/ustdio.h
View file

@ -454,9 +454,9 @@ U_STABLE UConverter* U_EXPORT2 u_fgetConverter(UFILE *f);
* @param patternSpecification A pattern specifying how <TT>u_printf</TT> will
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>stdout</TT>
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
u_printf(const char *patternSpecification,
... );
@ -495,18 +495,18 @@ u_vfprintf(UFILE *f,
* @param patternSpecification A pattern specifying how <TT>u_printf_u</TT> will
* interpret the variable arguments received and format the data.
* @return The number of Unicode characters written to <TT>stdout</TT>
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
u_printf_u(const UChar *patternSpecification,
... );
/**
* Get a UFILE for <TT>stdout</TT>.
* @return UFILE that writes to <TT>stdout</TT>
* @draft ICU 49
* @stable ICU 49
*/
U_DRAFT UFILE * U_EXPORT2
U_STABLE UFILE * U_EXPORT2
u_get_stdout(void);
/**