Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(783)

Unified Diff: source/common/rbbiscan.cpp

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/rbbidata.cpp ('k') | source/common/servlk.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/rbbiscan.cpp
diff --git a/source/common/rbbiscan.cpp b/source/common/rbbiscan.cpp
index 0113c08ed377d25afca0912c12c261736da6163b..dd33aaeb46db71d51495f8299ec65661236c8bfa 100644
--- a/source/common/rbbiscan.cpp
+++ b/source/common/rbbiscan.cpp
@@ -2,7 +2,7 @@
//
// file: rbbiscan.cpp
//
-// Copyright (C) 2002-2012, International Business Machines Corporation and others.
+// Copyright (C) 2002-2014, International Business Machines Corporation and others.
// All Rights Reserved.
//
// This file contains the Rule Based Break Iterator Rule Builder functions for
@@ -35,8 +35,6 @@
#include "uassert.h"
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
//------------------------------------------------------------------------------
//
// Unicode Set init strings for each of the character classes needed for parsing a rule file.
@@ -581,7 +579,7 @@ void RBBIRuleScanner::error(UErrorCode e) {
fRB->fParseError->line = fLineNum;
fRB->fParseError->offset = fCharNum;
fRB->fParseError->preContext[0] = 0;
- fRB->fParseError->preContext[0] = 0;
+ fRB->fParseError->postContext[0] = 0;
}
}
}
@@ -993,7 +991,7 @@ void RBBIRuleScanner::parse() {
if (tableEl->fCharClass >= 128 && tableEl->fCharClass < 240 && // Table specs a char class &&
fC.fEscaped == FALSE && // char is not escaped &&
fC.fChar != (UChar32)-1) { // char is not EOF
- U_ASSERT((tableEl->fCharClass-128) < LENGTHOF(fRuleSets));
+ U_ASSERT((tableEl->fCharClass-128) < UPRV_LENGTHOF(fRuleSets));
if (fRuleSets[tableEl->fCharClass-128].contains(fC.fChar)) {
// Table row specified a character class, or set of characters,
// and the current char matches it.
« no previous file with comments | « source/common/rbbidata.cpp ('k') | source/common/servlk.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698