AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-401 More 400 compilation changes.

Browse Source 
X-SVN-Rev: 1964
This commit is contained in:
Helena Chapman 2000-07-20 00:39:21 +00:00
parent 9a3bfe4de8
commit f9ea95a88e
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/compitr.cpp
View File

@ -89,7 +89,7 @@ void ComposedCharIter::getDecomposition(UnicodeString& result) const
UChar pos = ucmp16_getu(DecompData::offsets, curChar); UChar pos = ucmp16_getu(DecompData::offsets, curChar);
if (pos > minDecomp) { if (pos > minDecomp) {
Normalizer::doAppend(DecompData::contents, pos, result); Normalizer::doAppend((const UChar*)(DecompData::contents), pos, result);
} }
else if (hangul && curChar >= Normalizer::HANGUL_BASE && curChar < Normalizer::HANGUL_LIMIT) { else if (hangul && curChar >= Normalizer::HANGUL_BASE && curChar < Normalizer::HANGUL_LIMIT) {
Normalizer::hangulToJamo(curChar, result, (uint16_t)minDecomp); Normalizer::hangulToJamo(curChar, result, (uint16_t)minDecomp);

18
icu4c/source/common/normlzr.cpp
View File

@ -601,7 +601,9 @@ Normalizer::decompose(const UnicodeString& source,
if (offset > limit) { if (offset > limit) {
doAppend(DecompData::contents, offset, result); /* HSYS: Be sure to check this for later. UChar may not always be
uint16_t*/
doAppend((const UChar*)(DecompData::contents), offset, result);
} else if (ch >= HANGUL_BASE && ch < HANGUL_LIMIT && hangul) { } else if (ch >= HANGUL_BASE && ch < HANGUL_LIMIT && hangul) {
hangulToJamo(ch, result, limit); hangulToJamo(ch, result, limit);
} else { } else {
@ -638,9 +640,11 @@ UChar Normalizer::nextDecomp()
initBuffer(); initBuffer();
if (offset > minDecomp) { if (offset > minDecomp) {
doAppend(DecompData::contents, offset, buffer); /* HSYS: Be sure to check this for later. UChar may not always be
uint16_t*/
doAppend((const UChar*)(DecompData::contents), offset, buffer);
} else { } else {
buffer += ch; buffer += ch;
} }
UBool needToReorder = FALSE; UBool needToReorder = FALSE;
@ -718,7 +722,9 @@ UChar Normalizer::prevDecomp() {
// Now decompose this base character // Now decompose this base character
offset = ucmp16_getu(DecompData::offsets, ch); offset = ucmp16_getu(DecompData::offsets, ch);
if (offset > minDecomp) { if (offset > minDecomp) {
doInsert(DecompData::contents, offset, buffer, 0); /* HSYS: Be sure to check this for later. UChar may not always be
uint16_t*/
doInsert((const UChar *)(DecompData::contents), offset, buffer, 0);
} else { } else {
// This is a base character that doesn't decompose // This is a base character that doesn't decompose
// and isn't involved in reordering, so throw it back // and isn't involved in reordering, so throw it back
@ -1143,7 +1149,9 @@ void Normalizer::hangulToJamo(UChar ch, UnicodeString& result, uint16_t decompLi
void Normalizer::jamoAppend(UChar ch, uint16_t decompLimit, UnicodeString& dest) { void Normalizer::jamoAppend(UChar ch, uint16_t decompLimit, UnicodeString& dest) {
uint16_t offset = ucmp16_getu(DecompData::offsets, ch); uint16_t offset = ucmp16_getu(DecompData::offsets, ch);
if (offset > decompLimit) { if (offset > decompLimit) {
doAppend(DecompData::contents, offset, dest); /* HSYS: Be sure to check this for later. UChar may not always be
uint16_t*/
doAppend((const UChar*)(DecompData::contents), offset, dest);
} else { } else {
dest += ch; dest += ch;
} }

2
icu4c/source/common/ucnv_lmb.c
View File

@ -1275,7 +1275,7 @@ _LMBCSToUnicodeWithOffsets(UConverterToUnicodeArgs* args,
args->converter->invalidCharLength = savebytes; args->converter->invalidCharLength = savebytes;
uprv_memcpy(args->converter->invalidCharBuffer, saveSource, savebytes); uprv_memcpy(args->converter->invalidCharBuffer, saveSource, savebytes);
args->source = args->sourceLimit; args->source = args->sourceLimit;
*err = 0; *err = U_ZERO_ERROR;
} }
} }