| Index: source/i18n/unicode/coll.h
|
| diff --git a/source/i18n/unicode/coll.h b/source/i18n/unicode/coll.h
|
| index 1d2ff5b37f50fc399b5cc4cbfc31eec3aace2630..add6b5ba368f7b9d99ddd4a03f3619760c215831 100644
|
| --- a/source/i18n/unicode/coll.h
|
| +++ b/source/i18n/unicode/coll.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| ******************************************************************************
|
| -* Copyright (C) 1996-2014, International Business Machines
|
| +* Copyright (C) 1996-2015, International Business Machines
|
| * Corporation and others. All Rights Reserved.
|
| ******************************************************************************
|
| */
|
| @@ -607,7 +607,7 @@ public:
|
| * Retrieves the reordering codes for this collator.
|
| * @param dest The array to fill with the script ordering.
|
| * @param destCapacity The length of dest. If it is 0, then dest may be NULL and the function
|
| - * will only return the length of the result without writing any of the result string (pre-flighting).
|
| + * will only return the length of the result without writing any codes (pre-flighting).
|
| * @param status A reference to an error code value, which must not indicate
|
| * a failure before the function call.
|
| * @return The length of the script ordering array.
|
| @@ -630,6 +630,7 @@ public:
|
| * length is also set to 0. An empty array will clear any reordering codes on the collator.
|
| * @param reorderCodesLength The length of reorderCodes.
|
| * @param status error code
|
| + * @see ucol_setReorderCodes
|
| * @see Collator#getReorderCodes
|
| * @see Collator#getEquivalentReorderCodes
|
| * @see UScriptCode
|
| @@ -643,11 +644,13 @@ public:
|
| /**
|
| * Retrieves the reorder codes that are grouped with the given reorder code. Some reorder
|
| * codes will be grouped and must reorder together.
|
| + * Beginning with ICU 55, scripts only reorder together if they are primary-equal,
|
| + * for example Hiragana and Katakana.
|
| + *
|
| * @param reorderCode The reorder code to determine equivalence for.
|
| * @param dest The array to fill with the script equivalence reordering codes.
|
| * @param destCapacity The length of dest. If it is 0, then dest may be NULL and the
|
| - * function will only return the length of the result without writing any of the result
|
| - * string (pre-flighting).
|
| + * function will only return the length of the result without writing any codes (pre-flighting).
|
| * @param status A reference to an error code value, which must not indicate
|
| * a failure before the function call.
|
| * @return The length of the of the reordering code equivalence array.
|
| @@ -866,7 +869,6 @@ public:
|
| virtual UColAttributeValue getAttribute(UColAttribute attr,
|
| UErrorCode &status) const = 0;
|
|
|
| - /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft methods since they are virtual */
|
| /**
|
| * Sets the variable top to the top of the specified reordering group.
|
| * The variable top determines the highest-sorting character
|
| @@ -883,7 +885,7 @@ public:
|
| * function chaining. (See User Guide for details.)
|
| * @return *this
|
| * @see getMaxVariable
|
| - * @draft ICU 53
|
| + * @stable ICU 53
|
| */
|
| virtual Collator &setMaxVariable(UColReorderCode group, UErrorCode &errorCode);
|
|
|
| @@ -893,7 +895,7 @@ public:
|
| * The base class implementation returns UCOL_REORDER_CODE_PUNCTUATION.
|
| * @return the maximum variable reordering group.
|
| * @see setMaxVariable
|
| - * @draft ICU 53
|
| + * @stable ICU 53
|
| */
|
| virtual UColReorderCode getMaxVariable() const;
|
|
|
|
|