ICU-2412 thread safety stuff - added const to ucol_nextSortKeyPart, removed errorCode from UCollator structure - never worked but dangerous for thread safety.

X-SVN-Rev: 11410
This commit is contained in:
Vladimir Weinstein 2003-03-27 20:09:38 +00:00
parent 349e5b6038
commit a4a223f056
3 changed files with 5 additions and 5 deletions

View File

@ -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,

View File

@ -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;

View File

@ -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,