mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-21 04:29:31 +00:00
ICU-11313 Update U_HIDE_ macros (and U_DEPRECATED tags) for 55.0.1 (m1)
X-SVN-Rev: 36868
This commit is contained in:
parent
9855e4ef5f
commit
5239b60d43
7 changed files with 24 additions and 8 deletions
|
@ -191,6 +191,7 @@ 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.
|
||||
*
|
||||
|
@ -209,6 +210,7 @@ public:
|
|||
errorCode=U_MEMORY_ALLOCATION_ERROR;
|
||||
}
|
||||
}
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
/**
|
||||
* Destructor deletes the object it owns.
|
||||
* @stable ICU 4.4
|
||||
|
@ -226,6 +228,7 @@ 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.
|
||||
|
@ -252,6 +255,7 @@ public:
|
|||
delete p;
|
||||
}
|
||||
}
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -570,7 +570,7 @@ enum {
|
|||
* in which case it will be greater than destCapacity.
|
||||
* @deprecated ICU 55 Use UTS #46 instead via uidna_openUTS46() or class IDNA.
|
||||
*/
|
||||
U_STABLE int32_t U_EXPORT2
|
||||
U_DEPRECATED int32_t U_EXPORT2
|
||||
uidna_toASCII(const UChar* src, int32_t srcLength,
|
||||
UChar* dest, int32_t destCapacity,
|
||||
int32_t options,
|
||||
|
@ -618,7 +618,7 @@ uidna_toASCII(const UChar* src, int32_t srcLength,
|
|||
* in which case it will be greater than destCapacity.
|
||||
* @deprecated ICU 55 Use UTS #46 instead via uidna_openUTS46() or class IDNA.
|
||||
*/
|
||||
U_STABLE int32_t U_EXPORT2
|
||||
U_DEPRECATED int32_t U_EXPORT2
|
||||
uidna_toUnicode(const UChar* src, int32_t srcLength,
|
||||
UChar* dest, int32_t destCapacity,
|
||||
int32_t options,
|
||||
|
@ -669,7 +669,7 @@ uidna_toUnicode(const UChar* src, int32_t srcLength,
|
|||
* in which case it will be greater than destCapacity.
|
||||
* @deprecated ICU 55 Use UTS #46 instead via uidna_openUTS46() or class IDNA.
|
||||
*/
|
||||
U_STABLE int32_t U_EXPORT2
|
||||
U_DEPRECATED int32_t U_EXPORT2
|
||||
uidna_IDNToASCII( const UChar* src, int32_t srcLength,
|
||||
UChar* dest, int32_t destCapacity,
|
||||
int32_t options,
|
||||
|
@ -716,7 +716,7 @@ uidna_IDNToASCII( const UChar* src, int32_t srcLength,
|
|||
* in which case it will be greater than destCapacity.
|
||||
* @deprecated ICU 55 Use UTS #46 instead via uidna_openUTS46() or class IDNA.
|
||||
*/
|
||||
U_STABLE int32_t U_EXPORT2
|
||||
U_DEPRECATED int32_t U_EXPORT2
|
||||
uidna_IDNToUnicode( const UChar* src, int32_t srcLength,
|
||||
UChar* dest, int32_t destCapacity,
|
||||
int32_t options,
|
||||
|
@ -757,7 +757,7 @@ uidna_IDNToUnicode( const UChar* src, int32_t srcLength,
|
|||
* @return <0 or 0 or >0 as usual for string comparisons
|
||||
* @deprecated ICU 55 Use UTS #46 instead via uidna_openUTS46() or class IDNA.
|
||||
*/
|
||||
U_STABLE int32_t U_EXPORT2
|
||||
U_DEPRECATED int32_t U_EXPORT2
|
||||
uidna_compare( const UChar *s1, int32_t length1,
|
||||
const UChar *s2, int32_t length2,
|
||||
int32_t options,
|
||||
|
|
|
@ -641,14 +641,18 @@ typedef enum UErrorCode {
|
|||
U_REGEX_INVALID_FLAG, /**< Invalid value for match mode flags. */
|
||||
U_REGEX_LOOK_BEHIND_LIMIT, /**< Look-Behind pattern matches must have a bounded maximum length. */
|
||||
U_REGEX_SET_CONTAINS_STRING, /**< Regexps cannot have UnicodeSets containing strings.*/
|
||||
#ifndef U_HIDE_DEPRECATED_API
|
||||
U_REGEX_OCTAL_TOO_BIG, /**< Octal character constants must be <= 0377. @deprecated ICU 54. This error cannot occur. */
|
||||
U_REGEX_MISSING_CLOSE_BRACKET, /**< Missing closing bracket on a bracket expression. */
|
||||
#endif /* U_HIDE_DEPRECATED_API */
|
||||
U_REGEX_MISSING_CLOSE_BRACKET=U_REGEX_SET_CONTAINS_STRING+2, /**< Missing closing bracket on a bracket expression. */
|
||||
U_REGEX_INVALID_RANGE, /**< In a character range [x-y], x is greater than y. */
|
||||
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. */
|
||||
U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */
|
||||
U_REGEX_ERROR_LIMIT, /**< This must always be the last value to indicate the limit for regexp errors */
|
||||
#ifndef U_HIDE_DRAFT_API
|
||||
U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
U_REGEX_ERROR_LIMIT=U_REGEX_STOPPED_BY_CALLER+2, /**< This must always be the last value to indicate the limit for regexp errors */
|
||||
|
||||
/*
|
||||
* The error code in the range 0x10400-0x104ff are reserved for IDNA related error codes
|
||||
|
|
|
@ -2463,6 +2463,7 @@ private:
|
|||
UBool getImmediatePreviousZoneTransition(UDate base, UDate *transitionTime, UErrorCode& status) const;
|
||||
|
||||
public:
|
||||
#ifndef U_HIDE_INTERNAL_API
|
||||
/**
|
||||
* Creates a new Calendar from a Locale for the cache.
|
||||
* This method does not set the time or timezone in returned calendar.
|
||||
|
@ -2489,6 +2490,7 @@ public:
|
|||
char *typeBuffer,
|
||||
int32_t typeBufferSize,
|
||||
UErrorCode &status);
|
||||
#endif /* U_HIDE_INTERNAL_API */
|
||||
};
|
||||
|
||||
// -------------------------------------
|
||||
|
|
|
@ -903,6 +903,7 @@ private:
|
|||
*/
|
||||
static UBool U_EXPORT2 isNumericPatternChar(UChar c, int32_t count);
|
||||
public:
|
||||
#ifndef U_HIDE_INTERNAL_API
|
||||
/**
|
||||
* Gets a DateFormatSymbols by locale.
|
||||
* Unlike the constructors which always use gregorian calendar, this
|
||||
|
@ -916,6 +917,7 @@ public:
|
|||
*/
|
||||
static DateFormatSymbols * U_EXPORT2 createForLocale(
|
||||
const Locale &locale, UErrorCode &status);
|
||||
#endif /* U_HIDE_INTERNAL_API */
|
||||
};
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
|
|
@ -190,7 +190,9 @@ class U_I18N_API MeasureFormat : public Format {
|
|||
UnicodeString &appendTo,
|
||||
FieldPosition &pos,
|
||||
UErrorCode &status) const;
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
|
||||
#ifndef U_HIDE_DRAFT_API
|
||||
/**
|
||||
* Formats a single measure per unit. An example of such a
|
||||
* formatted string is 3.5 meters per second.
|
||||
|
|
|
@ -961,6 +961,7 @@ 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 }
|
||||
|
@ -990,6 +991,7 @@ udat_formatCalendar( const UDateFormat* format,
|
|||
int32_t capacity,
|
||||
UFieldPosition* position,
|
||||
UErrorCode* status);
|
||||
#endif /* U_HIDE_DRAFT_API */
|
||||
|
||||
/**
|
||||
* Parse a string into an date/time using a UDateFormat.
|
||||
|
|
Loading…
Add table
Reference in a new issue