diff --git a/icu4c/source/common/iculserv.cpp b/icu4c/source/common/iculserv.cpp index 79b349e428..953db878ee 100644 --- a/icu4c/source/common/iculserv.cpp +++ b/icu4c/source/common/iculserv.cpp @@ -875,17 +875,6 @@ public: return cl; } - virtual int32_t count(UErrorCode& status) const { - return upToDate(status) ? _ids.size() : 0; - } - - const UnicodeString* snext(UErrorCode& status) { - if (upToDate(status) && (_pos < _ids.size())) { - return (const UnicodeString*)_ids[_pos++]; - } - return NULL; - } - UBool upToDate(UErrorCode& status) const { if (U_SUCCESS(status)) { if (_timestamp == _service->getTimestamp()) { @@ -896,7 +885,18 @@ public: return FALSE; } - void reset(UErrorCode& status) { + virtual int32_t count(UErrorCode& status) const { + return upToDate(status) ? _ids.size() : 0; + } + + virtual const UnicodeString* snext(UErrorCode& status) { + if (upToDate(status) && (_pos < _ids.size())) { + return (const UnicodeString*)_ids[_pos++]; + } + return NULL; + } + + virtual void reset(UErrorCode& status) { if (status == U_ENUM_OUT_OF_SYNC_ERROR) { status = U_ZERO_ERROR; } diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index 9bf3a1eb98..8d77af416f 100644 --- a/icu4c/source/common/locid.cpp +++ b/icu4c/source/common/locid.cpp @@ -1216,7 +1216,7 @@ public: } } - ~KeywordEnumeration() { + virtual ~KeywordEnumeration() { uprv_free(keywords); }