diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp index 23557297f1..4bc569a631 100644 --- a/icu4c/source/i18n/ucol.cpp +++ b/icu4c/source/i18n/ucol.cpp @@ -827,7 +827,7 @@ UCollator* ucol_initCollator(const UCATableHeader *image, UCollator *fillIn, UEr fcdTrieIndex = unorm_getFCDTrie(status); } - result->errorCode = *status; + //result->errorCode = *status; result->latinOneCEs = NULL; @@ -3719,7 +3719,7 @@ ucol_getSortKey(const UCollator *coll, /*ucol_calcSortKeySimpleTertiary(...);*/ int32_t keySize = coll->sortKeyGen(coll, source, sourceLength, &result, resultLength, FALSE, &status); - ((UCollator *)coll)->errorCode = status; /*semantically const */ + //((UCollator *)coll)->errorCode = status; /*semantically const */ return keySize; } @@ -5150,7 +5150,7 @@ enum { * of normalizing sequence. */ U_CAPI int32_t U_EXPORT2 -ucol_nextSortKeyPart(UCollator *coll, +ucol_nextSortKeyPart(const UCollator *coll, UCharIterator *iter, uint32_t state[2], uint8_t *dest, int32_t count, diff --git a/icu4c/source/i18n/ucol_imp.h b/icu4c/source/i18n/ucol_imp.h index 3078dac755..b5e7a7d817 100644 --- a/icu4c/source/i18n/ucol_imp.h +++ b/icu4c/source/i18n/ucol_imp.h @@ -744,7 +744,7 @@ struct UCollator { int32_t rulesLength; int32_t latinOneTableLen; - UErrorCode errorCode; /* internal error code */ + /*UErrorCode errorCode;*/ /* internal error code */ uint32_t variableTopValue; UColAttributeValue frenchCollation; diff --git a/icu4c/source/i18n/unicode/ucol.h b/icu4c/source/i18n/unicode/ucol.h index de588e45b6..e9ae21c269 100644 --- a/icu4c/source/i18n/unicode/ucol.h +++ b/icu4c/source/i18n/unicode/ucol.h @@ -524,7 +524,7 @@ ucol_getSortKey(const UCollator *coll, * the sort key. */ U_CAPI int32_t U_EXPORT2 -ucol_nextSortKeyPart(UCollator *coll, +ucol_nextSortKeyPart(const UCollator *coll, UCharIterator *iter, uint32_t state[2], uint8_t *dest, int32_t count,