diff --git a/icu4c/source/i18n/olsontz.cpp b/icu4c/source/i18n/olsontz.cpp index 792a996b185..19d3f2c59e6 100644 --- a/icu4c/source/i18n/olsontz.cpp +++ b/icu4c/source/i18n/olsontz.cpp @@ -473,7 +473,8 @@ UBool OlsonTimeZone::useDaylightTime() const { } return FALSE; } -inline int32_t OlsonTimeZone::getDSTSavings() const{ +int32_t +OlsonTimeZone::getDSTSavings() const{ if(finalZone!=NULL){ return finalZone->getDSTSavings(); } diff --git a/icu4c/source/i18n/olsontz.h b/icu4c/source/i18n/olsontz.h index 4728b82adea..6f7d71cdc4c 100644 --- a/icu4c/source/i18n/olsontz.h +++ b/icu4c/source/i18n/olsontz.h @@ -209,7 +209,7 @@ class U_I18N_API OlsonTimeZone: public TimeZone { */ virtual UBool inDaylightTime(UDate date, UErrorCode& ec) const; - virtual inline int32_t getDSTSavings() const; + virtual int32_t getDSTSavings() const; protected: /** diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp index 42200e475bd..15c0d730e55 100644 --- a/icu4c/source/i18n/timezone.cpp +++ b/icu4c/source/i18n/timezone.cpp @@ -1074,7 +1074,7 @@ TimeZone::getDisplayName(UBool daylight, EDisplayType style, UnicodeString& resu return getDisplayName(daylight,style, Locale::getDefault(), result); } //-------------------------------------- -inline int32_t +int32_t TimeZone::getDSTSavings()const { if (useDaylightTime()) { return 3600000; diff --git a/icu4c/source/i18n/unicode/simpletz.h b/icu4c/source/i18n/unicode/simpletz.h index db180109191..bb7c9d14445 100644 --- a/icu4c/source/i18n/unicode/simpletz.h +++ b/icu4c/source/i18n/unicode/simpletz.h @@ -645,7 +645,7 @@ public: * are in effect. A positive number, typically one hour (3600000). * @stable ICU 2.0 */ - int32_t getDSTSavings(void) const; + virtual int32_t getDSTSavings(void) const; /** * Queries if this TimeZone uses Daylight Savings Time. diff --git a/icu4c/source/i18n/unicode/timezone.h b/icu4c/source/i18n/unicode/timezone.h index 861a03bf969..ef90ee13996 100644 --- a/icu4c/source/i18n/unicode/timezone.h +++ b/icu4c/source/i18n/unicode/timezone.h @@ -618,7 +618,7 @@ public: * @return the amount of saving time in milliseconds * @draft ICU 3.6 */ - virtual inline int32_t getDSTSavings() const; + virtual int32_t getDSTSavings() const; protected: /**