Update ICU to 61.1 + local patches
What's new in ICU 61.1:
- CLDR 33 (locale data; http://cldr.unicode.org/index/downloads/cldr-33 )
- A new number formatting API
- Rewrote U8_NEXT
- See http://site.icu-project.org/download/61 for more details.
The update steps are recorded in
https://chromium.googlesource.com/chromium/deps/icu/+log/f7ab784..b0e0b84
On top of the above, IANA timezone db was updated once more to the
latest 2018e (released on May 4th).
The list of local changes are:
* Update the currency list. For desktop, include all the national
currencies (see https://bugs.chromium.org/p/v8/issues/detail?id=7472 )
* Clean up disabled warning list in BUILD.gn/icu.gyp
* Fix clang on Windows and MSVC build failures
https://github.com/google/double-conversion/issues/66
http://bugs.icu-project.org/trac/ticket/13752
http://bugs.icu-project.org/trac/ticket/13750
* Rebuild the data files
Size is reduced by ~100kB for non-desktop.
Desktop(common): increase by 90kB
6,386,176 android/icudtl.dat (6,502,048)
4,929,248 cast/icudtl.dat (5,032,368)
10,264,208 common/icudtl.dat (10,171,920)
6,372,480 ios/icudtl.dat (6,488,384)
* Update IANA tz DB to 2018e
* Update README.chromium
* Drop patches that became unnecessary.
* Apply the remaining patches
Isvalidenum.patch, simplify_smallintformatter.patch,
word_long.patch, locid_map.patch
* Apply data-build related patches
{wpo,vscomp,data.build,data.build.win,data_symb}.patch
* Apply BreakIterator related patches + locale1 patch
* Apply Google's patch for locale data
* ICU 61.1 update step 1
Check in ICU 61.1 to the tree (61staging branch) by
running scripts/update.sh.
Build files are updated by the script.
* Update prep
TBR=thakis@chromium.org
Bug: 838383
Test: None
Change-Id: Ib83ed624fe764abdb7fbfd567ae5e982497089bd
Reviewed-on: https://chromium-review.googlesource.com/1041578
Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/source/common/brkiter.cpp b/source/common/brkiter.cpp
index ab02f1c..52e5c7c 100644
--- a/source/common/brkiter.cpp
+++ b/source/common/brkiter.cpp
@@ -52,7 +52,7 @@
// -------------------------------------
BreakIterator*
-BreakIterator::buildInstance(const Locale& loc, const char *type, int32_t kind, UErrorCode &status)
+BreakIterator::buildInstance(const Locale& loc, const char *type, UErrorCode &status)
{
char fnbuff[256];
char ext[4]={'\0'};
@@ -121,7 +121,6 @@
U_LOCALE_BASED(locBased, *(BreakIterator*)result);
locBased.setLocaleIDs(ures_getLocaleByType(b, ULOC_VALID_LOCALE, &status),
actualLocale.data());
- result->setBreakType(kind);
}
ures_close(b);
@@ -413,10 +412,10 @@
BreakIterator *result = NULL;
switch (kind) {
case UBRK_CHARACTER:
- result = BreakIterator::buildInstance(loc, "grapheme", kind, status);
+ result = BreakIterator::buildInstance(loc, "grapheme", status);
break;
case UBRK_WORD:
- result = BreakIterator::buildInstance(loc, "word", kind, status);
+ result = BreakIterator::buildInstance(loc, "word", status);
break;
case UBRK_LINE:
uprv_strcpy(lbType, "line");
@@ -429,10 +428,10 @@
uprv_strcat(lbType, lbKeyValue);
}
}
- result = BreakIterator::buildInstance(loc, lbType, kind, status);
+ result = BreakIterator::buildInstance(loc, lbType, status);
break;
case UBRK_SENTENCE:
- result = BreakIterator::buildInstance(loc, "sentence", kind, status);
+ result = BreakIterator::buildInstance(loc, "sentence", status);
#if !UCONFIG_NO_FILTERED_BREAK_ITERATION
{
char ssKeyValue[kKeyValueLenMax] = {0};
@@ -449,7 +448,7 @@
#endif
break;
case UBRK_TITLE:
- result = BreakIterator::buildInstance(loc, "title", kind, status);
+ result = BreakIterator::buildInstance(loc, "title", status);
break;
default:
status = U_ILLEGAL_ARGUMENT_ERROR;