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

Unified Diff: source/i18n/collationfastlatin.cpp

Issue 877193003: ICU update to 54.1 step 7 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: add one more msvc's warning fix 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/data/zone/reslocal.mk ('k') | source/i18n/decimfmt.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/i18n/collationfastlatin.cpp
diff --git a/source/i18n/collationfastlatin.cpp b/source/i18n/collationfastlatin.cpp
index 0b26d1d9f973551c8d8da126fb7d0a7d11b83fd9..dc654a3efc2d02f25aa31e2f5293198f68864772 100644
--- a/source/i18n/collationfastlatin.cpp
+++ b/source/i18n/collationfastlatin.cpp
@@ -39,10 +39,10 @@ CollationFastLatin::getOptions(const CollationData *data, const CollationSetting
uint32_t v1 = settings.variableTop >> 24;
int32_t headerLength = *table & 0xff;
int32_t i = headerLength - 1;
- if(i <= 0 || v1 > (table[i] & 0x7f)) {
+ if(i <= 0 || v1 > (table[i] & 0x7fu)) {
return -1; // variableTop >= digits, should not occur
}
- while(i > 1 && v1 <= (table[i - 1] & 0x7f)) { --i; }
+ while(i > 1 && v1 <= (table[i - 1] & 0x7fu)) { --i; }
// In the table header, the miniVarTop is in bits 15..7, with 4 zero bits 19..16 implied.
// Shift right to make it comparable with long mini primaries in bits 15..3.
miniVarTop = (table[i] & 0xff80) >> 4;
« no previous file with comments | « source/data/zone/reslocal.mk ('k') | source/i18n/decimfmt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698