organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-2943 fix compiler warnings - even more

Browse source 
X-SVN-Rev: 13502
This commit is contained in:
Steven R. Loomis 2003-10-28 01:52:29 +00:00
parent 4de3eb7b16
commit ebbf031deb
4 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
icu4c/source/i18n/calendar.cpp
View file

@ -343,15 +343,15 @@ getService(void)
static const int32_t kCalendarLimits[UCAL_FIELD_COUNT][4] = {
// Minimum Greatest min Least max Greatest max
{/* */}, // ERA
{/* */}, // YEAR
{/* */}, // MONTH
{/* */}, // WEEK_OF_YEAR
{/* */}, // WEEK_OF_MONTH
{/* */}, // DAY_OF_MONTH
{/* */}, // DAY_OF_YEAR
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // ERA
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // YEAR
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // MONTH
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // WEEK_OF_YEAR
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // WEEK_OF_MONTH
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // DAY_OF_MONTH
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // DAY_OF_YEAR
{ 1, 1, 7, 7 }, // DAY_OF_WEEK
{/* */}, // DAY_OF_WEEK_IN_MONTH
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // DAY_OF_WEEK_IN_MONTH
{ 0, 0, 1, 1 }, // AM_PM
{ 0, 0, 11, 11 }, // HOUR
{ 0, 0, 23, 23 }, // HOUR_OF_DAY
@ -360,11 +360,11 @@ static const int32_t kCalendarLimits[UCAL_FIELD_COUNT][4] = {
{ 0, 0, 999, 999 }, // MILLISECOND
{-12*kOneHour, -12*kOneHour, 12*kOneHour, 12*kOneHour }, // ZONE_OFFSET
{ 0, 0, 1*kOneHour, 1*kOneHour }, // DST_OFFSET
{/* */}, // YEAR_WOY
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // YEAR_WOY
{ 1, 1, 7, 7 }, // DOW_LOCAL
{/* */}, // EXTENDED_YEAR
{/*N/A*/-1, /*N/A*/-1, /*N/A*/-1, /*N/A*/-1}, // EXTENDED_YEAR
{ -0x7F000000, -0x7F000000, 0x7F000000, 0x7F000000 }, // JULIAN_DAY
{ 0, 0, 24*kOneHour-1, 24*kOneHour-1 }, // MILLISECONDS_IN_DAY
{ 0, 0, 24*kOneHour-1, 24*kOneHour-1 } // MILLISECONDS_IN_DAY
};
// Resource bundle tags read by this class
@ -1036,11 +1036,11 @@ void Calendar::computeGregorianAndDOWFields(int32_t julianDay, UErrorCode &ec)
computeGregorianFields(julianDay, ec);
// Compute day of week: JD 0 = Monday
int dow = julianDayToDayOfWeek(julianDay);
int32_t dow = julianDayToDayOfWeek(julianDay);
internalSet(UCAL_DAY_OF_WEEK,dow);
// Calculate 1-based localized day of week
int dowLocal = dow - getFirstDayOfWeek() + 1;
int32_t dowLocal = dow - getFirstDayOfWeek() + 1;
if (dowLocal < 1) {
dowLocal += 7;
}
@ -1084,6 +1084,9 @@ void Calendar::computeGregorianFields(int32_t julianDay, UErrorCode & /* ec */)
* proleptic Gregorian calendar, which has no field larger than a year.
*/
void Calendar::computeWeekFields(UErrorCode &ec) {
if(U_FAILURE(ec)) {
return;
}
int32_t eyear = fFields[UCAL_EXTENDED_YEAR];
int32_t year = fFields[UCAL_YEAR];
int32_t dayOfWeek = fFields[UCAL_DAY_OF_WEEK];
@ -1114,11 +1117,11 @@ void Calendar::computeWeekFields(UErrorCode &ec) {
// to handle the case in which we are the first week of the
// next year.
int prevDoy = dayOfYear + handleGetYearLength(eyear - 1);
int32_t prevDoy = dayOfYear + handleGetYearLength(eyear - 1);
woy = weekNumber(prevDoy, dayOfWeek);
yearOfWeekOfYear--;
} else {
int lastDoy = handleGetYearLength(eyear);
int32_t lastDoy = handleGetYearLength(eyear);
// Fast check: For it to be week 1 of the next year, the DOY
// must be on or after L-5, where L is yearLength(), then it
// cannot possibly be week 1 of the next year:
@ -1126,7 +1129,7 @@ void Calendar::computeWeekFields(UErrorCode &ec) {
// doy: 359 360 361 362 363 364 365 001
// dow: 1 2 3 4 5 6 7
if (dayOfYear >= (lastDoy - 5)) {
int lastRelDow = (relDow + lastDoy - dayOfYear) % 7;
int32_t lastRelDow = (relDow + lastDoy - dayOfYear) % 7;
if (lastRelDow < 0) {
lastRelDow += 7;
}
@ -1141,7 +1144,7 @@ void Calendar::computeWeekFields(UErrorCode &ec) {
fFields[UCAL_YEAR_WOY] = yearOfWeekOfYear;
// WEEK_OF_YEAR end
int dayOfMonth = fFields[UCAL_DAY_OF_MONTH];
int32_t dayOfMonth = fFields[UCAL_DAY_OF_MONTH];
fFields[UCAL_WEEK_OF_MONTH] = weekNumber(dayOfMonth, dayOfWeek);
fFields[UCAL_DAY_OF_WEEK_IN_MONTH] = (dayOfMonth-1) / 7 + 1;
#if defined (U_DEBUG_CAL)
@ -1172,14 +1175,14 @@ int32_t Calendar::weekNumber(int32_t desiredDay, int32_t dayOfPeriod, int32_t da
return weekNo;
}
void Calendar::handleComputeFields(int32_t julianDay, UErrorCode &status)
void Calendar::handleComputeFields(int32_t /* julianDay */, UErrorCode &/* status */)
{
internalSet(UCAL_MONTH, getGregorianMonth());
internalSet(UCAL_DAY_OF_MONTH, getGregorianDayOfMonth());
internalSet(UCAL_DAY_OF_YEAR, getGregorianDayOfYear());
int32_t eyear = getGregorianYear();
internalSet(UCAL_EXTENDED_YEAR, eyear);
int era = GregorianCalendar::AD;
int32_t era = GregorianCalendar::AD;
if (eyear < 1) {
era = GregorianCalendar::BC;
eyear = 1 - eyear;
@ -2298,9 +2301,9 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) {
int8_t month;
if(isSet(UCAL_MONTH)) {
month = internalGet(UCAL_MONTH);
month = (int8_t)internalGet(UCAL_MONTH);
} else {
month = getDefaultMonthInYear();
month = (int8_t)getDefaultMonthInYear();
}
int32_t julianDay = handleComputeMonthStart(year, useMonth ? month : 0, useMonth);

30
icu4c/source/i18n/gregocal.cpp
View file

@ -76,21 +76,21 @@ static const int32_t kGregorianCalendarLimits[UCAL_FIELD_COUNT][4] = {
{ 0, 0, 4, 6 }, // WEEK_OF_MONTH
{ 1, 1, 28, 31 }, // DAY_OF_MONTH
{ 1, 1, 365, 366 }, // DAY_OF_YEAR
{/* */}, // DAY_OF_WEEK
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// DAY_OF_WEEK
{ -1, -1, 4, 6 }, // DAY_OF_WEEK_IN_MONTH
{/* */}, // AM_PM
{/* */}, // HOUR
{/* */}, // HOUR_OF_DAY
{/* */}, // MINUTE
{/* */}, // SECOND
{/* */}, // MILLISECOND
{/* */}, // ZONE_OFFSET
{/* */}, // DST_OFFSET
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// AM_PM
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// HOUR
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// HOUR_OF_DAY
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// MINUTE
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// SECOND
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// MILLISECOND
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// ZONE_OFFSET
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// DST_OFFSET
{ -140742, -140742, 140742, 144683 }, // YEAR_WOY
{/* */}, // DOW_LOCAL
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// DOW_LOCAL
{ -140742, -140742, 140742, 144683 }, // EXTENDED_YEAR
{/* */}, // JULIAN_DAY
{/* */}, // MILLISECONDS_IN_DAY
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1},// JULIAN_DAY
{/*N/A*/-1,/*N/A*/-1,/*N/A*/-1,/*N/A*/-1} // MILLISECONDS_IN_DAY
};
// These numbers are 2^52 - 1, the largest allowable mantissa in a 64-bit double
@ -500,7 +500,7 @@ int32_t GregorianCalendar::handleComputeJulianDay(UCalendarDateFields bestField)
int32_t GregorianCalendar::handleComputeMonthStart(int32_t eyear, int32_t month,
UBool useMonth) const
UBool /* useMonth */) const
{
GregorianCalendar *nonConstThis = (GregorianCalendar*)this; // cast away const
@ -978,7 +978,7 @@ int32_t GregorianCalendar::getActualMaximum(UCalendarDateFields field, UErrorCod
int32_t lowGood = kGregorianCalendarLimits[UCAL_YEAR][1];
int32_t highBad = kGregorianCalendarLimits[UCAL_YEAR][2]+1;
while ((lowGood + 1) < highBad) {
int y = (lowGood + highBad) / 2;
int32_t y = (lowGood + highBad) / 2;
cal->set(UCAL_YEAR, y);
if (cal->get(UCAL_YEAR, status) == y && cal->get(UCAL_ERA, status) == era) {
lowGood = y;
@ -1008,7 +1008,7 @@ int32_t GregorianCalendar::handleGetExtendedYear() {
case UCAL_YEAR:
{
// The year defaults to the epoch start, the era to AD
int era = internalGet(UCAL_ERA, AD);
int32_t era = internalGet(UCAL_ERA, AD);
if (era == BC) {
year = 1 - internalGet(UCAL_YEAR, 1); // Convert to extended year
} else {

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

@ -1387,7 +1387,7 @@ protected:
* default implementation in Calendar.
* @stable ICU 2.0
*/
virtual int32_t handleGetYearLength(int eyear) const;
virtual int32_t handleGetYearLength(int32_t eyear) const;
/**

6
icu4c/source/i18n/unicode/gregocal.h
View file

@ -523,7 +523,7 @@ protected:
virtual int32_t handleComputeMonthStart(int32_t eyear, int32_t month,
UBool useMonth) const;
virtual int32_t GregorianCalendar::handleComputeJulianDay(UCalendarDateFields bestField) ;
virtual int32_t handleComputeJulianDay(UCalendarDateFields bestField) ;
/**
@ -623,7 +623,7 @@ protected:
*/
virtual int32_t handleGetLimit(UCalendarDateFields field, ELimitType limitType) const;
virtual int32_t GregorianCalendar::handleGetExtendedYear();
virtual int32_t handleGetExtendedYear();
/**
* Subclasses may override this to convert from week fields
@ -683,7 +683,7 @@ protected:
/**
* Julian day number of the Gregorian cutover
*/
uint32_t fCutoverJulianDay;
int32_t fCutoverJulianDay;
/**
* Midnight, local time (using this Calendar's TimeZone) at or before the