From 949c868bab9b83ea7dd3f73e68a735d5c759acc7 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Sat, 5 Jun 2004 07:04:46 +0000 Subject: [PATCH] ICU-3500 Fix some compiler warnings X-SVN-Rev: 15746 --- icu4c/source/i18n/gregocal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/i18n/gregocal.cpp b/icu4c/source/i18n/gregocal.cpp index bea538c3ab..97c4fe3bb3 100644 --- a/icu4c/source/i18n/gregocal.cpp +++ b/icu4c/source/i18n/gregocal.cpp @@ -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 *