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

Unified Diff: source/common/ucol_swp.cpp

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 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/ucnvscsu.c ('k') | source/common/udata.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/ucol_swp.cpp
diff --git a/source/common/ucol_swp.cpp b/source/common/ucol_swp.cpp
index 0625dd35a8aa1a2d8aa0d442e302a57d774a961c..759743528c0914e9e17c74751dee53f5867ddadc 100644
--- a/source/common/ucol_swp.cpp
+++ b/source/common/ucol_swp.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2003-2014, International Business Machines
+* Copyright (C) 2003-2015, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -340,7 +340,7 @@ swapFormatVersion3(const UDataSwapper *ds,
return header.size;
}
-// swap formatVersion 4 ---------------------------------------------------- ***
+// swap formatVersion 4 or 5 ----------------------------------------------- ***
// The following are copied from CollationDataReader, trading an awkward copy of constants
// for an awkward relocation of the i18n collationdatareader.h file into the common library.
@@ -566,7 +566,7 @@ ucol_swap(const UDataSwapper *ds,
info.dataFormat[1]==0x43 &&
info.dataFormat[2]==0x6f &&
info.dataFormat[3]==0x6c &&
- (info.formatVersion[0]==3 || info.formatVersion[0]==4)
+ (3<=info.formatVersion[0] && info.formatVersion[0]<=5)
)) {
udata_printError(ds, "ucol_swap(): data format %02x.%02x.%02x.%02x "
"(format version %02x.%02x) is not recognized as collation data\n",
« no previous file with comments | « source/common/ucnvscsu.c ('k') | source/common/udata.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698