| Index: base/i18n/break_iterator.cc
|
| diff --git a/base/i18n/break_iterator.cc b/base/i18n/break_iterator.cc
|
| index 224bb51d79c7b3abc84ea325214d99a2b275cbd8..afa1fd80d89b080a97a0585351b1be0b6daacd71 100644
|
| --- a/base/i18n/break_iterator.cc
|
| +++ b/base/i18n/break_iterator.cc
|
| @@ -71,9 +71,8 @@ bool BreakIterator::Advance() {
|
| case BREAK_NEWLINE:
|
| do {
|
| pos = ubrk_next(static_cast<UBreakIterator*>(iter_));
|
| - if (pos == UBRK_DONE) {
|
| + if (pos == UBRK_DONE)
|
| break;
|
| - }
|
| pos_ = static_cast<size_t>(pos);
|
| status = ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_));
|
| } while (status >= UBRK_LINE_SOFT && status < UBRK_LINE_SOFT_LIMIT);
|
| @@ -89,9 +88,8 @@ bool BreakIterator::Advance() {
|
| }
|
|
|
| bool BreakIterator::IsWord() const {
|
| - return (break_type_ == BREAK_WORD &&
|
| - ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_)) !=
|
| - UBRK_WORD_NONE);
|
| + int32_t status = ubrk_getRuleStatus(static_cast<UBreakIterator*>(iter_));
|
| + return (break_type_ == BREAK_WORD && status != UBRK_WORD_NONE);
|
| }
|
|
|
| string16 BreakIterator::GetString() const {
|
|
|