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

ICU-3500 Fix some compiler warnings

Browse Source 
X-SVN-Rev: 15746
This commit is contained in:
George Rhoten 2004-06-05 07:04:46 +00:00
parent 437efd9802
commit 949c868bab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/i18n/gregocal.cpp
View File

@ -795,7 +795,7 @@ GregorianCalendar::aggregateStamp(int32_t stamp_a, int32_t stamp_b)
{
return (((stamp_a != kUnset && stamp_b != kUnset)
? uprv_max(stamp_a, stamp_b)
: kUnset));
: (int32_t)kUnset));
}
// -------------------------------------
@ -1233,7 +1233,7 @@ GregorianCalendar::inDaylightTime(UErrorCode& status) const
*/
int32_t
GregorianCalendar::internalGetEra() const {
return isSet(UCAL_ERA) ? internalGet(UCAL_ERA) : AD;
return isSet(UCAL_ERA) ? internalGet(UCAL_ERA) : (int32_t)AD;
}
const char *