diff --git a/icu4c/source/common/unicode/uversion.h b/icu4c/source/common/unicode/uversion.h index 9304f4c68b5..a06373b68a0 100644 --- a/icu4c/source/common/unicode/uversion.h +++ b/icu4c/source/common/unicode/uversion.h @@ -136,18 +136,23 @@ u_getVersion(UVersionInfo versionArray); /** If the version is different, sortkeys for the same string could be different */ /** version 2 was in ICU 1.8.1. changed is: compression intervals, French secondary */ /** compression, generating quad level always when strength is quad or more */ -#define UCOL_RUNTIME_VERSION 3 +/** version 4 - ICU 2.2 - tracking UCA changes, ignore completely ignorables */ +/** in contractions, ignore primary ignorables after shifted */ +#define UCOL_RUNTIME_VERSION 4 /** Builder code version. When this is different, same tailoring might result */ /** in assigning different collation elements to code points */ /** version 2 was in ICU 1.8.1. added support for prefixes, tweaked canonical */ /** closure. However, the tailorings should probably get same CEs assigned */ -#define UCOL_BUILDER_VERSION 4 +/** version 5 - ICU 2.2 - fixed some bugs, renamed some indirect values. */ +/** Backward compatible with the old rules. */ +#define UCOL_BUILDER_VERSION 5 /* This is the version of FractionalUCA.txt tailoring rules*/ /* Version 1 was in ICU 1.8.1. Version two contains canonical closure for */ /* supplementary code points */ -#define UCOL_FRACTIONAL_UCA_VERSION 3 +/* Version 4 in ICU 2.2, following UCA=3.1.1d6, UCD=3.2.0 */ +#define UCOL_FRACTIONAL_UCA_VERSION 4 /** This is the version of the tailorings */ #define UCOL_TAILORINGS_VERSION 1 diff --git a/icu4c/source/test/cintltst/capitst.c b/icu4c/source/test/cintltst/capitst.c index bd87bc11073..100309d4c36 100644 --- a/icu4c/source/test/cintltst/capitst.c +++ b/icu4c/source/test/cintltst/capitst.c @@ -221,8 +221,9 @@ void TestProperty() version. ICU 2.0 currVersionArray = {0x18, 0xC0, 0x02, 0x02}; ICU 2.1 currVersionArray = {0x19, 0x00, 0x03, 0x03}; + ICU 2.2 currVersionArray = {0x21, 0x40, 0x04, 0x04}; */ - UVersionInfo currVersionArray = {0x19, 0x00, 0x03, 0x03}; + UVersionInfo currVersionArray = {0x21, 0x40, 0x04, 0x04}; UVersionInfo versionArray; log_verbose("The property tests begin : \n"); diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index 1fefac6247f..0130b85a7bf 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -90,8 +90,9 @@ CollationAPITest::TestProperty(/* char* par */) version. ICU 2.0 currVersionArray = {0x18, 0xC0, 0x02, 0x02}; ICU 2.1 currVersionArray = {0x19, 0x00, 0x03, 0x03}; + ICU 2.2 currVersionArray = {0x21, 0x40, 0x04, 0x04}; */ - UVersionInfo currVersionArray = {0x19, 0x00, 0x03, 0x03}; + UVersionInfo currVersionArray = {0x21, 0x40, 0x04, 0x04}; UVersionInfo versionArray; int i = 0;