ICU-739 Fix for the ADS compiler.

X-SVN-Rev: 17205
This commit is contained in:
George Rhoten 2005-02-16 07:53:42 +00:00
parent baac5d7e02
commit 29eb86aa35
2 changed files with 7 additions and 5 deletions

View File

@ -520,10 +520,12 @@ NameToEnum::swap(const UDataSwapper *ds,
* which makes testing harder
*/
cmp.chars=(const char *)outBytes;
cmp.propCompare=
ds->outCharset==U_ASCII_FAMILY ?
uprv_compareASCIIPropertyNames :
uprv_compareEBCDICPropertyNames;
if (ds->outCharset==U_ASCII_FAMILY) {
cmp.propCompare=uprv_compareASCIIPropertyNames;
}
else {
cmp.propCompare=uprv_compareEBCDICPropertyNames;
}
uprv_sortArray(sortArray, tempMap->count, sizeof(NameAndIndex),
upname_compareRows, &cmp,
TRUE, pErrorCode);

View File

@ -143,7 +143,7 @@ RBBIDataHeader *RBBIRuleBuilder::flattenData() {
}
// Remove comments and whitespace from the rules to make it smaller.
UnicodeString strippedRules(RBBIRuleScanner::stripRules(fRules));
UnicodeString strippedRules((const UnicodeString&)RBBIRuleScanner::stripRules(fRules));
// Calculate the size of each section in the data.
// Sizes here are padded up to a multiple of 8 for better memory alignment.