ICU-900 Fixed some compiler warnings.

X-SVN-Rev: 7834
This commit is contained in:
George Rhoten 2002-03-01 03:41:41 +00:00
parent c6eb94c9a4
commit a5539d4e82
5 changed files with 17 additions and 11 deletions

View File

@ -729,11 +729,11 @@ void RuleHalf::removeContext() {
* Return true if this half looks like valid output, that is, does not
* contain quantifiers or other special input-only elements.
*/
UBool RuleHalf::isValidOutput(TransliteratorParser& parser) {
UBool RuleHalf::isValidOutput(TransliteratorParser& transParser) {
for (int32_t i=0; i<text.length(); ) {
UChar32 c = text.char32At(i);
i += UTF_CHAR_LENGTH(c);
if (!parser.parseData->isReplacer(c)) {
if (!transParser.parseData->isReplacer(c)) {
return FALSE;
}
}
@ -744,11 +744,11 @@ UBool RuleHalf::isValidOutput(TransliteratorParser& parser) {
* Return true if this half looks like valid input, that is, does not
* contain functions or other special output-only elements.
*/
UBool RuleHalf::isValidInput(TransliteratorParser& parser) {
UBool RuleHalf::isValidInput(TransliteratorParser& transParser) {
for (int32_t i=0; i<text.length(); ) {
UChar32 c = text.char32At(i);
i += UTF_CHAR_LENGTH(c);
if (!parser.parseData->isMatcher(c)) {
if (!transParser.parseData->isMatcher(c)) {
return FALSE;
}
}

View File

@ -287,13 +287,15 @@ UnicodeSet* TransliteratorIDParser::parseGlobalFilter(const UnicodeString& id, i
return filter;
}
static void _deleteSingleID(void* obj) {
U_CDECL_BEGIN
static void U_CALLCONV _deleteSingleID(void* obj) {
delete (TransliteratorIDParser::SingleID*) obj;
}
static void _deleteTransliterator(void* obj) {
static void U_CALLCONV _deleteTransliterator(void* obj) {
delete (Transliterator*) obj;
}
U_CDECL_END
/**
* Parse a compound ID, consisting of an optional forward global

View File

@ -4,8 +4,8 @@
* Corporation and others. All Rights Reserved.
**********************************************************************
* $Source: /xsrl/Nsvn/icu/icu/source/i18n/Attic/upropset.cpp,v $
* $Date: 2002/01/23 02:01:18 $
* $Revision: 1.13 $
* $Date: 2002/03/01 03:41:39 $
* $Revision: 1.14 $
**********************************************************************
*/
#include "upropset.h"
@ -339,11 +339,13 @@ UnicodeSet* UnicodePropertySet::createScriptSet(const UnicodeString& valueName)
// Utility methods
//----------------------------------------------------------------
U_CDECL_BEGIN
static UBool U_CALLCONV
_enumCategoryRange(const void *context, UChar32 start, UChar32 limit, UCharCategory type) {
CATEGORY_CACHE[type].add(start, limit-1);
return TRUE;
}
U_CDECL_END
/**
* Returns a UnicodeSet for the given category. This set is

View File

@ -307,7 +307,7 @@ void UnicodeTest::TestIdentifier()
}
/* for each line of UnicodeData.txt, check some of the properties */
void U_CALLCONV
U_CAPI void U_CALLCONV
UnicodeTest::unicodeDataLineFn(void *context,
char *fields[][2], int32_t fieldCount,
UErrorCode *pErrorCode) {

View File

@ -167,13 +167,15 @@ writeCCode(const char *filename, const char *destdir) {
}
}
/* Function renaming shouldn't be done in data */
sprintf(buffer,
"#include \"unicode/utypes.h\"\n"
"#define U_DISABLE_RENAMING 1\n"
"#include \"unicode/umachine.h\"\n"
"U_CDECL_BEGIN\n"
"const struct {\n"
" double bogus;\n"
" uint8_t bytes[%ld]; \n"
"} %s%s={ 0, {\n",
"} %s%s={ 0.0, {\n",
(long)T_FileStream_size(in), symPrefix, entry);
T_FileStream_writeLine(out, buffer);