Index: source/common/unicode/brkiter.h |
diff --git a/source/common/unicode/brkiter.h b/source/common/unicode/brkiter.h |
index 4e601bad899515dad3219c710b829f09eea090e3..4aa5e552796090eaebcd7ce7b7d275aa8b3775b4 100644 |
--- a/source/common/unicode/brkiter.h |
+++ b/source/common/unicode/brkiter.h |
@@ -1,6 +1,6 @@ |
/* |
******************************************************************************** |
-* Copyright (C) 1997-2013, International Business Machines |
+* Copyright (C) 1997-2014, International Business Machines |
* Corporation and others. All Rights Reserved. |
******************************************************************************** |
* |
@@ -213,8 +213,8 @@ public: |
}; |
/** |
- * Set the iterator position to the index of the first character in the text being scanned. |
- * @return The index of the first character in the text being scanned. |
+ * Sets the current iteration position to the beginning of the text, position zero. |
+ * @return The offset of the beginning of the text, zero. |
* @stable ICU 2.0 |
*/ |
virtual int32_t first(void) = 0; |
@@ -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); |
@@ -526,6 +526,9 @@ public: |
* The break iterator will be adopted. Clones of the iterator will be returned |
* if a request for a break iterator of the given kind matches or falls back to |
* this locale. |
+ * Because ICU may choose to cache BreakIterators internally, this must |
+ * be called at application startup, prior to any calls to |
+ * BreakIterator::createXXXInstance to avoid undefined behavior. |
* @param toAdopt the BreakIterator instance to be adopted |
* @param locale the Locale for which this instance is to be registered |
* @param kind the type of iterator for which this instance is to be registered |
@@ -542,6 +545,9 @@ public: |
* Unregister a previously-registered BreakIterator using the key returned from the |
* register call. Key becomes invalid after a successful call and should not be used again. |
* The BreakIterator corresponding to the key will be deleted. |
+ * Because ICU may choose to cache BreakIterators internally, this should |
+ * be called during application shutdown, after all calls to |
+ * BreakIterator::createXXXInstance to avoid undefined behavior. |
* @param key the registry key returned by a previous call to registerInstance |
* @param status the in/out status code, no special meanings are assigned |
* @return TRUE if the iterator for the key was successfully unregistered |
@@ -617,7 +623,8 @@ protected: |
BreakIterator(); |
/** @internal */ |
BreakIterator (const BreakIterator &other) : UObject(other) {} |
- |
+ /** @internal */ |
+ BreakIterator (const Locale& valid, const Locale& actual); |
private: |
/** @internal */ |