organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-3905 Fix some compiler warnings.

Browse source 
X-SVN-Rev: 16196
This commit is contained in:
George Rhoten 2004-08-27 16:45:16 +00:00
parent bc04cf3e3f
commit 038f43c843
14 changed files with 73 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/locid.cpp
View file

@ -1226,7 +1226,7 @@ public:
return new KeywordEnumeration(keywords, length, (int32_t)(current - keywords), status);
}
int32_t count(UErrorCode &/*status*/) const {
virtual int32_t count(UErrorCode &/*status*/) const {
char *kw = keywords;
int32_t result = 0;
while(*kw) {
@ -1236,7 +1236,7 @@ public:
return result;
}
const char* next(int32_t* resultLength, UErrorCode& status) {
virtual const char* next(int32_t* resultLength, UErrorCode& status) {
const char* result;
int32_t len;
if(U_SUCCESS(status) && *current != 0) {
@ -1255,13 +1255,13 @@ public:
return result;
}
const UnicodeString* snext(UErrorCode& status) {
virtual const UnicodeString* snext(UErrorCode& status) {
int32_t resultLength = 0;
const char *s = next(&resultLength, status);
return setChars(s, resultLength, status);
}
void reset(UErrorCode& /*status*/) {
virtual void reset(UErrorCode& /*status*/) {
current = keywords;
}
};

1
icu4c/source/common/ucnv_u16.c
View file

@ -19,7 +19,6 @@
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"
#include "cmemory.h"

1
icu4c/source/common/ucnv_u32.c
View file

@ -19,7 +19,6 @@
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"
#include "cmemory.h"

1
icu4c/source/common/ucnv_u7.c
View file

@ -19,7 +19,6 @@
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"

1
icu4c/source/common/ucnv_u8.c
View file

@ -23,7 +23,6 @@
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"
#include "cmemory.h"

1
icu4c/source/common/ucnvhz.c
View file

@ -19,7 +19,6 @@
#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
#include "cmemory.h"
#include "unicode/ucnv_err.h"
#include "unicode/ucnv.h"
#include "unicode/ucnv_cb.h"
#include "unicode/uset.h"

1
icu4c/source/common/ucnvisci.c
View file

@ -20,7 +20,6 @@
#if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
#include "cmemory.h"
#include "unicode/ucnv_err.h"
#include "ucnv_bld.h"
#include "unicode/ucnv.h"
#include "ucnv_cnv.h"

1
icu4c/source/common/ucnvlat1.c
View file

@ -17,7 +17,6 @@
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
#include "unicode/ucnv_err.h"
#include "unicode/uset.h"
#include "ucnv_bld.h"
#include "ucnv_cnv.h"

8
icu4c/source/common/unicode/uniset.h
View file

@ -715,12 +715,12 @@ public:
* Implement UnicodeMatcher::matches()
* @stable ICU 2.4
*/
UMatchDegree matches(const Replaceable& text,
virtual UMatchDegree matches(const Replaceable& text,
int32_t& offset,
int32_t limit,
UBool incremental);
private:
private:
/**
* Returns the longest match for s in text at the given position.
* If limit > start then match forward from start+1 to limit
@ -757,7 +757,7 @@ public:
*/
int32_t findCodePoint(UChar32 c) const;
public:
public:
/**
* Implementation of UnicodeMatcher API. Union the set of all
@ -766,7 +766,7 @@ public:
* @param toUnionTo the set into which to union the source characters
* @stable ICU 2.4
*/
void addMatchSetTo(UnicodeSet& toUnionTo) const;
virtual void addMatchSetTo(UnicodeSet& toUnionTo) const;
/**
* Returns the index of the given character within this set, where

2
icu4c/source/common/unicode/utf16.h
View file

@ -100,7 +100,7 @@
* @stable ICU 2.4
*/
#define U16_GET_SUPPLEMENTARY(lead, trail) \
(((lead)<<10UL)+(trail)-U16_SURROGATE_OFFSET)
(((UChar32)(lead)<<10UL)+(UChar32)(trail)-U16_SURROGATE_OFFSET)
/**

118
icu4c/source/i18n/nfsubs.h
View file

@ -267,11 +267,11 @@ public:
const UnicodeString& description,
UErrorCode& status);
int64_t transformNumber(int64_t number) const { return number; }
double transformNumber(double number) const { return number; }
double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return newRuleValue; }
double calcUpperBound(double oldUpperBound) const { return oldUpperBound; }
UChar tokenChar() const { return (UChar)0x003d; } // '='
virtual int64_t transformNumber(int64_t number) const { return number; }
virtual double transformNumber(double number) const { return number; }
virtual double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return newRuleValue; }
virtual double calcUpperBound(double oldUpperBound) const { return oldUpperBound; }
virtual UChar tokenChar() const { return (UChar)0x003d; } // '='
private:
static const char fgClassID;
@ -299,7 +299,7 @@ public:
}
}
void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) {
virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) {
divisor = uprv_pow(radix, exponent);
ldivisor = util64_fromDouble(divisor);
@ -308,23 +308,23 @@ public:
}
}
UBool operator==(const NFSubstitution& rhs) const;
virtual UBool operator==(const NFSubstitution& rhs) const;
int64_t transformNumber(int64_t number) const {
virtual int64_t transformNumber(int64_t number) const {
return number / ldivisor;
}
double transformNumber(double number) const {
virtual double transformNumber(double number) const {
return uprv_floor(number / divisor);
}
double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const {
virtual double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const {
return newRuleValue * divisor;
}
double calcUpperBound(double /*oldUpperBound*/) const { return divisor; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return divisor; }
UChar tokenChar() const { return (UChar)0x003c; } // '<'
virtual UChar tokenChar() const { return (UChar)0x003c; } // '<'
private:
static const char fgClassID;
@ -346,7 +346,7 @@ public:
const UnicodeString& description,
UErrorCode& status);
void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) {
virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) {
divisor = uprv_pow(radix, exponent);
ldivisor = util64_fromDouble(divisor);
@ -355,30 +355,30 @@ public:
}
}
UBool operator==(const NFSubstitution& rhs) const;
virtual UBool operator==(const NFSubstitution& rhs) const;
void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos) const;
void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos) const;
virtual void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos) const;
virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos) const;
int64_t transformNumber(int64_t number) const { return number % ldivisor; }
double transformNumber(double number) const { return uprv_fmod(number, divisor); }
virtual int64_t transformNumber(int64_t number) const { return number % ldivisor; }
virtual double transformNumber(double number) const { return uprv_fmod(number, divisor); }
UBool doParse(const UnicodeString& text,
virtual UBool doParse(const UnicodeString& text,
ParsePosition& parsePosition,
double baseValue,
double upperBound,
UBool lenientParse,
Formattable& result) const;
double composeRuleValue(double newRuleValue, double oldRuleValue) const {
virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const {
return oldRuleValue - uprv_fmod(oldRuleValue, divisor) + newRuleValue;
}
double calcUpperBound(double /*oldUpperBound*/) const { return divisor; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return divisor; }
UBool isModulusSubstitution() const { return TRUE; }
virtual UBool isModulusSubstitution() const { return TRUE; }
UChar tokenChar() const { return (UChar)0x003e; } // '>'
virtual UChar tokenChar() const { return (UChar)0x003e; } // '>'
private:
static const char fgClassID;
@ -396,11 +396,11 @@ public:
UErrorCode& status)
: NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
int64_t transformNumber(int64_t number) const { return number; }
double transformNumber(double number) const { return uprv_floor(number); }
double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
UChar tokenChar() const { return (UChar)0x003c; } // '<'
virtual int64_t transformNumber(int64_t number) const { return number; }
virtual double transformNumber(double number) const { return uprv_floor(number); }
virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
virtual UChar tokenChar() const { return (UChar)0x003c; } // '<'
private:
static const char fgClassID;
@ -420,23 +420,23 @@ public:
const UnicodeString& description,
UErrorCode& status);
UBool operator==(const NFSubstitution& rhs) const;
virtual UBool operator==(const NFSubstitution& rhs) const;
void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos) const;
void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
int64_t transformNumber(int64_t /*number*/) const { return 0; }
double transformNumber(double number) const { return number - uprv_floor(number); }
virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos) const;
virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
virtual int64_t transformNumber(int64_t /*number*/) const { return 0; }
virtual double transformNumber(double number) const { return number - uprv_floor(number); }
UBool doParse(const UnicodeString& text,
virtual UBool doParse(const UnicodeString& text,
ParsePosition& parsePosition,
double baseValue,
double upperBound,
UBool lenientParse,
Formattable& result) const;
double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
double calcUpperBound(double /*oldUpperBound*/) const { return 0.0; }
UChar tokenChar() const { return (UChar)0x003e; } // '>'
virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return 0.0; }
virtual UChar tokenChar() const { return (UChar)0x003e; } // '>'
private:
static const char fgClassID;
@ -454,11 +454,11 @@ public:
UErrorCode& status)
: NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
int64_t transformNumber(int64_t number) const { return number >= 0 ? number : -number; }
double transformNumber(double number) const { return uprv_fabs(number); }
double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return -newRuleValue; }
double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
UChar tokenChar() const { return (UChar)0x003e; } // '>'
virtual int64_t transformNumber(int64_t number) const { return number >= 0 ? number : -number; }
virtual double transformNumber(double number) const { return uprv_fabs(number); }
virtual double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return -newRuleValue; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
virtual UChar tokenChar() const { return (UChar)0x003e; } // '>'
private:
static const char fgClassID;
@ -482,12 +482,12 @@ public:
ldenominator = util64_fromDouble(denominator);
}
UBool operator==(const NFSubstitution& rhs) const;
virtual UBool operator==(const NFSubstitution& rhs) const;
int64_t transformNumber(int64_t number) const { return number * ldenominator; }
double transformNumber(double number) const { return uprv_round(number * denominator); }
virtual int64_t transformNumber(int64_t number) const { return number * ldenominator; }
virtual double transformNumber(double number) const { return uprv_round(number * denominator); }
UBool doParse(const UnicodeString& text,
virtual UBool doParse(const UnicodeString& text,
ParsePosition& parsePosition,
double baseValue,
double upperBound,
@ -499,9 +499,9 @@ public:
// it SERIOUSLY messes up the algorithm
return NFSubstitution::doParse(text, parsePosition, baseValue, upperBound, FALSE, result);
}
double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue / oldRuleValue; }
double calcUpperBound(double /*oldUpperBound*/) const { return denominator; }
UChar tokenChar() const { return (UChar)0x003c; } // '<'
virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue / oldRuleValue; }
virtual double calcUpperBound(double /*oldUpperBound*/) const { return denominator; }
virtual UChar tokenChar() const { return (UChar)0x003c; } // '<'
private:
static const char fgClassID;
@ -519,22 +519,22 @@ public:
UErrorCode& status)
: NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
void toString(UnicodeString& /*result*/) const {}
void doSubstitution(double /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
int64_t transformNumber(int64_t /*number*/) const { return 0; }
double transformNumber(double /*number*/) const { return 0; }
UBool doParse(const UnicodeString& /*text*/,
virtual void toString(UnicodeString& /*result*/) const {}
virtual void doSubstitution(double /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/) const {}
virtual int64_t transformNumber(int64_t /*number*/) const { return 0; }
virtual double transformNumber(double /*number*/) const { return 0; }
virtual UBool doParse(const UnicodeString& /*text*/,
ParsePosition& /*parsePosition*/,
double baseValue,
double /*upperBound*/,
UBool /*lenientParse*/,
Formattable& result) const
{ result.setDouble(baseValue); return TRUE; }
double composeRuleValue(double /*newRuleValue*/, double /*oldRuleValue*/) const { return 0.0; } // never called
double calcUpperBound(double /*oldUpperBound*/) const { return 0; } // never called
UBool isNullSubstitution() const { return TRUE; }
UChar tokenChar() const { return (UChar)0x0020; } // ' ' never called
virtual double composeRuleValue(double /*newRuleValue*/, double /*oldRuleValue*/) const { return 0.0; } // never called
virtual double calcUpperBound(double /*oldUpperBound*/) const { return 0; } // never called
virtual UBool isNullSubstitution() const { return TRUE; }
virtual UChar tokenChar() const { return (UChar)0x0020; } // ' ' never called
private:
static const char fgClassID;

6
icu4c/source/i18n/timezone.cpp
View file

@ -788,11 +788,11 @@ public:
return new TZEnumeration(*this);
}
int32_t count(UErrorCode& status) const {
virtual int32_t count(UErrorCode& status) const {
return U_FAILURE(status) ? 0 : len;
}
const UnicodeString* snext(UErrorCode& status) {
virtual const UnicodeString* snext(UErrorCode& status) {
if (U_SUCCESS(status) && pos < len) {
getID((map == 0) ? pos : map[pos]);
++pos;
@ -801,7 +801,7 @@ public:
return 0;
}
void reset(UErrorCode& /*status*/) {
virtual void reset(UErrorCode& /*status*/) {
pos = 0;
}

2
icu4c/source/i18n/unicode/coleitr.h
View file

@ -143,7 +143,7 @@ public:
* Destructor
* @stable ICU 2.0
*/
~CollationElementIterator();
virtual ~CollationElementIterator();
// CollationElementIterator public methods ----------------------------------

2
icu4c/source/i18n/unicode/dtfmtsym.h
View file

@ -150,7 +150,7 @@ public:
* subclassed.
* @stable ICU 2.0
*/
~DateFormatSymbols();
virtual ~DateFormatSymbols();
/**
* Return true if another object is semantically equal to this one.