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

Side by Side Diff: patches/locid.patch

Issue 822213003: ICU upgrade to 54.1 step 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: readme: better wrapping, declspec patch dropped 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 unified diff | Download patch
« no previous file with comments | « patches/declspec.patch ('k') | patches/platform_nacl.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Index: source/common/locid.cpp 1 diff --git a/source/common/locid.cpp b/source/common/locid.cpp
2 =================================================================== 2 index f073aad..02da988 100644
3 --- source/common/locid.cpp» (revision 36834) 3 --- a/source/common/locid.cpp
4 +++ source/common/locid.cpp» (working copy) 4 +++ b/source/common/locid.cpp
5 @@ -484,6 +484,13 @@ 5 @@ -509,6 +509,13 @@ Locale& Locale::init(const char* localeID, UBool canonicali ze)
6 /* preset all fields to empty */ 6 /* preset all fields to empty */
7 language[0] = script[0] = country[0] = 0; 7 language[0] = script[0] = country[0] = 0;
8 8
9 + // Need to reset baseName. Otherwise, when a Locale object created with 9 + // Need to reset baseName. Otherwise, when a Locale object created with
10 + // the default constructor is changed with setFromPOSIXID() later 10 + // the default constructor is changed with setFromPOSIXID() later
11 + // (e.g. locales obtained with getAvailableLocales()), 11 + // (e.g. locales obtained with getAvailableLocales()),
12 + // baseName will be still that of the default locale instead of one 12 + // baseName will be still that of the default locale instead of one
13 + // corresponding to localeID. 13 + // corresponding to localeID.
14 + baseName = NULL; 14 + baseName = NULL;
15 + 15 +
16 // "canonicalize" the locale ID to ICU/Java format 16 // "canonicalize" the locale ID to ICU/Java format
17 err = U_ZERO_ERROR; 17 err = U_ZERO_ERROR;
18 length = canonicalize ? 18 length = canonicalize ?
OLDNEW
« no previous file with comments | « patches/declspec.patch ('k') | patches/platform_nacl.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698