From a3cbe809091807b406cf526635cb866270a20da2 Mon Sep 17 00:00:00 2001 From: Fredrik Roubert Date: Wed, 15 Feb 2023 22:53:37 +0100 Subject: [PATCH] ICU-21833 Replace U_OVERRIDE with override everywhere. --- icu4c/source/common/locavailable.cpp | 2 +- icu4c/source/common/norm2allmodes.h | 72 +++++++++---------- icu4c/source/common/normalizer2.cpp | 26 +++---- icu4c/source/common/static_unicode_sets.cpp | 2 +- icu4c/source/common/unicode/normalizer2.h | 30 ++++---- icu4c/source/common/unicode/umachine.h | 11 --- .../source/common/ustr_titlecase_brkiter.cpp | 40 +++++------ icu4c/source/i18n/formattedval_impl.h | 16 ++--- icu4c/source/i18n/fphdlimp.h | 12 ++-- icu4c/source/i18n/number_asformat.h | 14 ++-- icu4c/source/i18n/number_compact.h | 8 +-- icu4c/source/i18n/number_decimalquantity.h | 8 +-- icu4c/source/i18n/number_longnames.cpp | 4 +- icu4c/source/i18n/number_longnames.h | 10 +-- icu4c/source/i18n/number_mapper.h | 40 +++++------ icu4c/source/i18n/number_microprops.h | 2 +- icu4c/source/i18n/number_modifiers.h | 60 ++++++++-------- icu4c/source/i18n/number_multiplier.h | 2 +- icu4c/source/i18n/number_patternmodifier.h | 24 +++---- icu4c/source/i18n/number_patternstring.h | 22 +++--- icu4c/source/i18n/number_scientific.h | 18 ++--- icu4c/source/i18n/number_usageprefs.h | 4 +- icu4c/source/i18n/numparse_validators.h | 26 +++---- icu4c/source/i18n/numrange_impl.cpp | 2 +- icu4c/source/i18n/pluralranges.cpp | 2 +- icu4c/source/i18n/plurrule_impl.h | 10 +-- .../i18n/unicode/compactdecimalformat.h | 12 ++-- icu4c/source/i18n/unicode/decimfmt.h | 56 +++++++-------- icu4c/source/i18n/unicode/dtitvfmt.h | 10 +-- icu4c/source/i18n/unicode/formattednumber.h | 10 +-- icu4c/source/i18n/unicode/listformatter.h | 10 +-- .../i18n/unicode/numberrangeformatter.h | 8 +-- icu4c/source/i18n/unicode/reldatefmt.h | 10 +-- icu4c/source/test/intltest/itutil.cpp | 4 +- .../test/intltest/numbertest_affixutils.cpp | 2 +- icu4c/source/test/intltest/rbbimonkeytest.h | 2 +- icu4c/source/tools/gennorm2/extradata.h | 2 +- icu4c/source/tools/gennorm2/n2builder.cpp | 2 +- icu4c/source/tools/gennorm2/norms.h | 4 +- .../com/ibm/icu/dev/tools/docs/StableAPI.java | 2 +- .../unicode/c/genprops/layoutpropsbuilder.cpp | 10 +-- 41 files changed, 300 insertions(+), 311 deletions(-) diff --git a/icu4c/source/common/locavailable.cpp b/icu4c/source/common/locavailable.cpp index 374f1a3b8e7..f553378e101 100644 --- a/icu4c/source/common/locavailable.cpp +++ b/icu4c/source/common/locavailable.cpp @@ -106,7 +106,7 @@ icu::UInitOnce ginstalledLocalesInitOnce {}; class AvailableLocalesSink : public ResourceSink { public: - void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE { + void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override { ResourceTable resIndexTable = value.getTable(status); if (U_FAILURE(status)) { return; diff --git a/icu4c/source/common/norm2allmodes.h b/icu4c/source/common/norm2allmodes.h index 4374f718365..6347fba9cb7 100644 --- a/icu4c/source/common/norm2allmodes.h +++ b/icu4c/source/common/norm2allmodes.h @@ -38,7 +38,7 @@ public: virtual UnicodeString & normalize(const UnicodeString &src, UnicodeString &dest, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { dest.setToBogus(); return dest; @@ -64,13 +64,13 @@ public: virtual UnicodeString & normalizeSecondAndAppend(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { return normalizeSecondAndAppend(first, second, true, errorCode); } virtual UnicodeString & append(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { return normalizeSecondAndAppend(first, second, false, errorCode); } UnicodeString & @@ -107,7 +107,7 @@ public: UnicodeString &safeMiddle, ReorderingBuffer &buffer, UErrorCode &errorCode) const = 0; virtual UBool - getDecomposition(UChar32 c, UnicodeString &decomposition) const U_OVERRIDE { + getDecomposition(UChar32 c, UnicodeString &decomposition) const override { char16_t buffer[4]; int32_t length; const char16_t *d=impl.getDecomposition(c, buffer, length); @@ -122,7 +122,7 @@ public: return true; } virtual UBool - getRawDecomposition(UChar32 c, UnicodeString &decomposition) const U_OVERRIDE { + getRawDecomposition(UChar32 c, UnicodeString &decomposition) const override { char16_t buffer[30]; int32_t length; const char16_t *d=impl.getRawDecomposition(c, buffer, length); @@ -137,18 +137,18 @@ public: return true; } virtual UChar32 - composePair(UChar32 a, UChar32 b) const U_OVERRIDE { + composePair(UChar32 a, UChar32 b) const override { return impl.composePair(a, b); } virtual uint8_t - getCombiningClass(UChar32 c) const U_OVERRIDE { + getCombiningClass(UChar32 c) const override { return impl.getCC(impl.getNorm16(c)); } // quick checks virtual UBool - isNormalized(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { + isNormalized(const UnicodeString &s, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return false; } @@ -161,11 +161,11 @@ public: return sLimit==spanQuickCheckYes(sArray, sLimit, errorCode); } virtual UNormalizationCheckResult - quickCheck(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { + quickCheck(const UnicodeString &s, UErrorCode &errorCode) const override { return Normalizer2WithImpl::isNormalized(s, errorCode) ? UNORM_YES : UNORM_NO; } virtual int32_t - spanQuickCheckYes(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { + spanQuickCheckYes(const UnicodeString &s, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return 0; } @@ -194,20 +194,20 @@ public: private: virtual void normalize(const char16_t *src, const char16_t *limit, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.decompose(src, limit, &buffer, errorCode); } using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. virtual void normalizeAndAppend(const char16_t *src, const char16_t *limit, UBool doNormalize, UnicodeString &safeMiddle, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.decomposeAndAppend(src, limit, doNormalize, safeMiddle, buffer, errorCode); } void normalizeUTF8(uint32_t options, StringPiece src, ByteSink &sink, - Edits *edits, UErrorCode &errorCode) const U_OVERRIDE { + Edits *edits, UErrorCode &errorCode) const override { if (U_FAILURE(errorCode)) { return; } @@ -219,7 +219,7 @@ private: sink.Flush(); } virtual UBool - isNormalizedUTF8(StringPiece sp, UErrorCode &errorCode) const U_OVERRIDE { + isNormalizedUTF8(StringPiece sp, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return false; } @@ -229,20 +229,20 @@ private: } virtual const char16_t * - spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &errorCode) const U_OVERRIDE { + spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &errorCode) const override { return impl.decompose(src, limit, nullptr, errorCode); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const U_OVERRIDE { + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const override { return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; } - virtual UBool hasBoundaryBefore(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryBefore(UChar32 c) const override { return impl.hasDecompBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryAfter(UChar32 c) const override { return impl.hasDecompBoundaryAfter(c); } - virtual UBool isInert(UChar32 c) const U_OVERRIDE { + virtual UBool isInert(UChar32 c) const override { return impl.isDecompInert(c); } }; @@ -256,14 +256,14 @@ public: private: virtual void normalize(const char16_t *src, const char16_t *limit, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.compose(src, limit, onlyContiguous, true, buffer, errorCode); } using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. void normalizeUTF8(uint32_t options, StringPiece src, ByteSink &sink, - Edits *edits, UErrorCode &errorCode) const U_OVERRIDE { + Edits *edits, UErrorCode &errorCode) const override { if (U_FAILURE(errorCode)) { return; } @@ -279,12 +279,12 @@ private: virtual void normalizeAndAppend(const char16_t *src, const char16_t *limit, UBool doNormalize, UnicodeString &safeMiddle, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.composeAndAppend(src, limit, doNormalize, onlyContiguous, safeMiddle, buffer, errorCode); } virtual UBool - isNormalized(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { + isNormalized(const UnicodeString &s, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return false; } @@ -301,7 +301,7 @@ private: return impl.compose(sArray, sArray+s.length(), onlyContiguous, false, buffer, errorCode); } virtual UBool - isNormalizedUTF8(StringPiece sp, UErrorCode &errorCode) const U_OVERRIDE { + isNormalizedUTF8(StringPiece sp, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return false; } @@ -309,7 +309,7 @@ private: return impl.composeUTF8(0, onlyContiguous, s, s + sp.length(), nullptr, nullptr, errorCode); } virtual UNormalizationCheckResult - quickCheck(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE { + quickCheck(const UnicodeString &s, UErrorCode &errorCode) const override { if(U_FAILURE(errorCode)) { return UNORM_MAYBE; } @@ -323,20 +323,20 @@ private: return qcResult; } virtual const char16_t * - spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &) const U_OVERRIDE { + spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &) const override { return impl.composeQuickCheck(src, limit, onlyContiguous, nullptr); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const U_OVERRIDE { + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const override { return impl.getCompQuickCheck(impl.getNorm16(c)); } - virtual UBool hasBoundaryBefore(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryBefore(UChar32 c) const override { return impl.hasCompBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryAfter(UChar32 c) const override { return impl.hasCompBoundaryAfter(c, onlyContiguous); } - virtual UBool isInert(UChar32 c) const U_OVERRIDE { + virtual UBool isInert(UChar32 c) const override { return impl.isCompInert(c, onlyContiguous); } @@ -351,28 +351,28 @@ public: private: virtual void normalize(const char16_t *src, const char16_t *limit, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.makeFCD(src, limit, &buffer, errorCode); } using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. virtual void normalizeAndAppend(const char16_t *src, const char16_t *limit, UBool doNormalize, UnicodeString &safeMiddle, - ReorderingBuffer &buffer, UErrorCode &errorCode) const U_OVERRIDE { + ReorderingBuffer &buffer, UErrorCode &errorCode) const override { impl.makeFCDAndAppend(src, limit, doNormalize, safeMiddle, buffer, errorCode); } virtual const char16_t * - spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &errorCode) const U_OVERRIDE { + spanQuickCheckYes(const char16_t *src, const char16_t *limit, UErrorCode &errorCode) const override { return impl.makeFCD(src, limit, nullptr, errorCode); } using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UBool hasBoundaryBefore(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryBefore(UChar32 c) const override { return impl.hasFCDBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const U_OVERRIDE { + virtual UBool hasBoundaryAfter(UChar32 c) const override { return impl.hasFCDBoundaryAfter(c); } - virtual UBool isInert(UChar32 c) const U_OVERRIDE { + virtual UBool isInert(UChar32 c) const override { return impl.isFCDInert(c); } }; diff --git a/icu4c/source/common/normalizer2.cpp b/icu4c/source/common/normalizer2.cpp index e12edba486b..6856736b888 100644 --- a/icu4c/source/common/normalizer2.cpp +++ b/icu4c/source/common/normalizer2.cpp @@ -87,7 +87,7 @@ class NoopNormalizer2 : public Normalizer2 { virtual UnicodeString & normalize(const UnicodeString &src, UnicodeString &dest, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { if(U_SUCCESS(errorCode)) { if(&dest!=&src) { dest=src; @@ -99,7 +99,7 @@ class NoopNormalizer2 : public Normalizer2 { } virtual void normalizeUTF8(uint32_t options, StringPiece src, ByteSink &sink, - Edits *edits, UErrorCode &errorCode) const U_OVERRIDE { + Edits *edits, UErrorCode &errorCode) const override { if(U_SUCCESS(errorCode)) { if (edits != nullptr) { if ((options & U_EDITS_NO_RESET) == 0) { @@ -117,7 +117,7 @@ class NoopNormalizer2 : public Normalizer2 { virtual UnicodeString & normalizeSecondAndAppend(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { if(U_SUCCESS(errorCode)) { if(&first!=&second) { first.append(second); @@ -130,7 +130,7 @@ class NoopNormalizer2 : public Normalizer2 { virtual UnicodeString & append(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE { + UErrorCode &errorCode) const override { if(U_SUCCESS(errorCode)) { if(&first!=&second) { first.append(second); @@ -141,29 +141,29 @@ class NoopNormalizer2 : public Normalizer2 { return first; } virtual UBool - getDecomposition(UChar32, UnicodeString &) const U_OVERRIDE { + getDecomposition(UChar32, UnicodeString &) const override { return false; } - // No need to U_OVERRIDE the default getRawDecomposition(). + // No need to override the default getRawDecomposition(). virtual UBool - isNormalized(const UnicodeString &, UErrorCode &errorCode) const U_OVERRIDE { + isNormalized(const UnicodeString &, UErrorCode &errorCode) const override { return U_SUCCESS(errorCode); } virtual UBool - isNormalizedUTF8(StringPiece, UErrorCode &errorCode) const U_OVERRIDE { + isNormalizedUTF8(StringPiece, UErrorCode &errorCode) const override { return U_SUCCESS(errorCode); } virtual UNormalizationCheckResult - quickCheck(const UnicodeString &, UErrorCode &) const U_OVERRIDE { + quickCheck(const UnicodeString &, UErrorCode &) const override { return UNORM_YES; } virtual int32_t - spanQuickCheckYes(const UnicodeString &s, UErrorCode &) const U_OVERRIDE { + spanQuickCheckYes(const UnicodeString &s, UErrorCode &) const override { return s.length(); } - virtual UBool hasBoundaryBefore(UChar32) const U_OVERRIDE { return true; } - virtual UBool hasBoundaryAfter(UChar32) const U_OVERRIDE { return true; } - virtual UBool isInert(UChar32) const U_OVERRIDE { return true; } + virtual UBool hasBoundaryBefore(UChar32) const override { return true; } + virtual UBool hasBoundaryAfter(UChar32) const override { return true; } + virtual UBool isInert(UChar32) const override { return true; } }; NoopNormalizer2::~NoopNormalizer2() {} diff --git a/icu4c/source/common/static_unicode_sets.cpp b/icu4c/source/common/static_unicode_sets.cpp index db9432f49a8..0db5ea000d4 100644 --- a/icu4c/source/common/static_unicode_sets.cpp +++ b/icu4c/source/common/static_unicode_sets.cpp @@ -72,7 +72,7 @@ void saveSet(Key key, const UnicodeString& unicodeSetPattern, UErrorCode& status class ParseDataSink : public ResourceSink { public: - void put(const char* key, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) U_OVERRIDE { + void put(const char* key, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) override { ResourceTable contextsTable = value.getTable(status); if (U_FAILURE(status)) { return; } for (int i = 0; contextsTable.getKeyAndValue(i, key, value); i++) { diff --git a/icu4c/source/common/unicode/normalizer2.h b/icu4c/source/common/unicode/normalizer2.h index 174a8c70a42..972894ec42a 100644 --- a/icu4c/source/common/unicode/normalizer2.h +++ b/icu4c/source/common/unicode/normalizer2.h @@ -533,7 +533,7 @@ public: virtual UnicodeString & normalize(const UnicodeString &src, UnicodeString &dest, - UErrorCode &errorCode) const U_OVERRIDE; + UErrorCode &errorCode) const override; /** * Normalizes a UTF-8 string and optionally records how source substrings @@ -559,7 +559,7 @@ public: */ virtual void normalizeUTF8(uint32_t options, StringPiece src, ByteSink &sink, - Edits *edits, UErrorCode &errorCode) const U_OVERRIDE; + Edits *edits, UErrorCode &errorCode) const override; /** * Appends the normalized form of the second string to the first string @@ -578,7 +578,7 @@ public: virtual UnicodeString & normalizeSecondAndAppend(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE; + UErrorCode &errorCode) const override; /** * Appends the second string to the first string * (merging them at the boundary) and returns the first string. @@ -596,7 +596,7 @@ public: virtual UnicodeString & append(UnicodeString &first, const UnicodeString &second, - UErrorCode &errorCode) const U_OVERRIDE; + UErrorCode &errorCode) const override; /** * Gets the decomposition mapping of c. @@ -610,7 +610,7 @@ public: * @stable ICU 4.6 */ virtual UBool - getDecomposition(UChar32 c, UnicodeString &decomposition) const U_OVERRIDE; + getDecomposition(UChar32 c, UnicodeString &decomposition) const override; /** * Gets the raw decomposition mapping of c. @@ -624,7 +624,7 @@ public: * @stable ICU 49 */ virtual UBool - getRawDecomposition(UChar32 c, UnicodeString &decomposition) const U_OVERRIDE; + getRawDecomposition(UChar32 c, UnicodeString &decomposition) const override; /** * Performs pairwise composition of a & b and returns the composite if there is one. @@ -637,7 +637,7 @@ public: * @stable ICU 49 */ virtual UChar32 - composePair(UChar32 a, UChar32 b) const U_OVERRIDE; + composePair(UChar32 a, UChar32 b) const override; /** * Gets the combining class of c. @@ -648,7 +648,7 @@ public: * @stable ICU 49 */ virtual uint8_t - getCombiningClass(UChar32 c) const U_OVERRIDE; + getCombiningClass(UChar32 c) const override; /** * Tests if the string is normalized. @@ -662,7 +662,7 @@ public: * @stable ICU 4.4 */ virtual UBool - isNormalized(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE; + isNormalized(const UnicodeString &s, UErrorCode &errorCode) const override; /** * Tests if the UTF-8 string is normalized. * Internally, in cases where the quickCheck() method would return "maybe" @@ -683,7 +683,7 @@ public: * @stable ICU 60 */ virtual UBool - isNormalizedUTF8(StringPiece s, UErrorCode &errorCode) const U_OVERRIDE; + isNormalizedUTF8(StringPiece s, UErrorCode &errorCode) const override; /** * Tests if the string is normalized. * For details see the Normalizer2 base class documentation. @@ -696,7 +696,7 @@ public: * @stable ICU 4.4 */ virtual UNormalizationCheckResult - quickCheck(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE; + quickCheck(const UnicodeString &s, UErrorCode &errorCode) const override; /** * Returns the end of the normalized substring of the input string. * For details see the Normalizer2 base class documentation. @@ -709,7 +709,7 @@ public: * @stable ICU 4.4 */ virtual int32_t - spanQuickCheckYes(const UnicodeString &s, UErrorCode &errorCode) const U_OVERRIDE; + spanQuickCheckYes(const UnicodeString &s, UErrorCode &errorCode) const override; /** * Tests if the character always has a normalization boundary before it, @@ -719,7 +719,7 @@ public: * @return true if c has a normalization boundary before it * @stable ICU 4.4 */ - virtual UBool hasBoundaryBefore(UChar32 c) const U_OVERRIDE; + virtual UBool hasBoundaryBefore(UChar32 c) const override; /** * Tests if the character always has a normalization boundary after it, @@ -729,7 +729,7 @@ public: * @return true if c has a normalization boundary after it * @stable ICU 4.4 */ - virtual UBool hasBoundaryAfter(UChar32 c) const U_OVERRIDE; + virtual UBool hasBoundaryAfter(UChar32 c) const override; /** * Tests if the character is normalization-inert. @@ -738,7 +738,7 @@ public: * @return true if c is normalization-inert * @stable ICU 4.4 */ - virtual UBool isInert(UChar32 c) const U_OVERRIDE; + virtual UBool isInert(UChar32 c) const override; private: UnicodeString & normalize(const UnicodeString &src, diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h index 66406062726..dbf6dea1f6f 100644 --- a/icu4c/source/common/unicode/umachine.h +++ b/icu4c/source/common/unicode/umachine.h @@ -119,17 +119,6 @@ /** Obsolete/same as U_CAPI; was used to declare a function as an internal ICU C API */ #define U_INTERNAL U_CAPI -/** - * \def U_OVERRIDE - * Defined to the C++11 "override" keyword if available. - * Denotes a class or member which is an override of the base class. - * May result in an error if it applied to something not an override. - * @internal - */ -#ifndef U_OVERRIDE -#define U_OVERRIDE override -#endif - /** * \def U_FINAL * Defined to the C++11 "final" keyword if available. diff --git a/icu4c/source/common/ustr_titlecase_brkiter.cpp b/icu4c/source/common/ustr_titlecase_brkiter.cpp index aeeffbffa5f..82beaca65b2 100644 --- a/icu4c/source/common/ustr_titlecase_brkiter.cpp +++ b/icu4c/source/common/ustr_titlecase_brkiter.cpp @@ -43,28 +43,28 @@ U_NAMESPACE_BEGIN class WholeStringBreakIterator : public BreakIterator { public: WholeStringBreakIterator() : BreakIterator(), length(0) {} - ~WholeStringBreakIterator() U_OVERRIDE; - bool operator==(const BreakIterator&) const U_OVERRIDE; - WholeStringBreakIterator *clone() const U_OVERRIDE; + ~WholeStringBreakIterator() override; + bool operator==(const BreakIterator&) const override; + WholeStringBreakIterator *clone() const override; static UClassID U_EXPORT2 getStaticClassID(); - UClassID getDynamicClassID() const U_OVERRIDE; - CharacterIterator &getText() const U_OVERRIDE; - UText *getUText(UText *fillIn, UErrorCode &errorCode) const U_OVERRIDE; - void setText(const UnicodeString &text) U_OVERRIDE; - void setText(UText *text, UErrorCode &errorCode) U_OVERRIDE; - void adoptText(CharacterIterator* it) U_OVERRIDE; - int32_t first() U_OVERRIDE; - int32_t last() U_OVERRIDE; - int32_t previous() U_OVERRIDE; - int32_t next() U_OVERRIDE; - int32_t current() const U_OVERRIDE; - int32_t following(int32_t offset) U_OVERRIDE; - int32_t preceding(int32_t offset) U_OVERRIDE; - UBool isBoundary(int32_t offset) U_OVERRIDE; - int32_t next(int32_t n) U_OVERRIDE; + UClassID getDynamicClassID() const override; + CharacterIterator &getText() const override; + UText *getUText(UText *fillIn, UErrorCode &errorCode) const override; + void setText(const UnicodeString &text) override; + void setText(UText *text, UErrorCode &errorCode) override; + void adoptText(CharacterIterator* it) override; + int32_t first() override; + int32_t last() override; + int32_t previous() override; + int32_t next() override; + int32_t current() const override; + int32_t following(int32_t offset) override; + int32_t preceding(int32_t offset) override; + UBool isBoundary(int32_t offset) override; + int32_t next(int32_t n) override; WholeStringBreakIterator *createBufferClone(void *stackBuffer, int32_t &BufferSize, - UErrorCode &errorCode) U_OVERRIDE; - WholeStringBreakIterator &refreshInputText(UText *input, UErrorCode &errorCode) U_OVERRIDE; + UErrorCode &errorCode) override; + WholeStringBreakIterator &refreshInputText(UText *input, UErrorCode &errorCode) override; private: int32_t length; diff --git a/icu4c/source/i18n/formattedval_impl.h b/icu4c/source/i18n/formattedval_impl.h index bc03af46274..378aa32435a 100644 --- a/icu4c/source/i18n/formattedval_impl.h +++ b/icu4c/source/i18n/formattedval_impl.h @@ -83,10 +83,10 @@ public: // Implementation of FormattedValue (const): - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; - Appendable& appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; + UnicodeString toTempString(UErrorCode& status) const override; + Appendable& appendTo(Appendable& appendable, UErrorCode& status) const override; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; // Additional methods used during construction phase only (non-const): @@ -158,10 +158,10 @@ public: // Implementation of FormattedValue (const): - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; - Appendable& appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; + UnicodeString toTempString(UErrorCode& status) const override; + Appendable& appendTo(Appendable& appendable, UErrorCode& status) const override; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; // Additional helper functions: UBool nextFieldPosition(FieldPosition& fp, UErrorCode& status) const; diff --git a/icu4c/source/i18n/fphdlimp.h b/icu4c/source/i18n/fphdlimp.h index 20eccca5882..9c9955fb42b 100644 --- a/icu4c/source/i18n/fphdlimp.h +++ b/icu4c/source/i18n/fphdlimp.h @@ -48,9 +48,9 @@ class FieldPositionOnlyHandler : public FieldPositionHandler { FieldPositionOnlyHandler(FieldPosition& pos); virtual ~FieldPositionOnlyHandler(); - void addAttribute(int32_t id, int32_t start, int32_t limit) U_OVERRIDE; - void shiftLast(int32_t delta) U_OVERRIDE; - UBool isRecording(void) const U_OVERRIDE; + void addAttribute(int32_t id, int32_t start, int32_t limit) override; + void shiftLast(int32_t delta) override; + UBool isRecording(void) const override; /** * Enable this option to lock in the FieldPosition value after seeing the @@ -86,9 +86,9 @@ class U_I18N_API FieldPositionIteratorHandler : public FieldPositionHandler { FieldPositionIteratorHandler(UVector32* vec, UErrorCode& status); ~FieldPositionIteratorHandler(); - void addAttribute(int32_t id, int32_t start, int32_t limit) U_OVERRIDE; - void shiftLast(int32_t delta) U_OVERRIDE; - UBool isRecording(void) const U_OVERRIDE; + void addAttribute(int32_t id, int32_t start, int32_t limit) override; + void shiftLast(int32_t delta) override; + UBool isRecording(void) const override; /** Copies a failed error code into _status. */ inline void getError(UErrorCode& _status) { diff --git a/icu4c/source/i18n/number_asformat.h b/icu4c/source/i18n/number_asformat.h index 394b9a811fd..f921b429420 100644 --- a/icu4c/source/i18n/number_asformat.h +++ b/icu4c/source/i18n/number_asformat.h @@ -34,37 +34,37 @@ class U_I18N_API LocalizedNumberFormatterAsFormat : public Format { /** * Destructor. */ - ~LocalizedNumberFormatterAsFormat() U_OVERRIDE; + ~LocalizedNumberFormatterAsFormat() override; /** * Equals operator. */ - bool operator==(const Format& other) const U_OVERRIDE; + bool operator==(const Format& other) const override; /** * Creates a copy of this object. */ - LocalizedNumberFormatterAsFormat* clone() const U_OVERRIDE; + LocalizedNumberFormatterAsFormat* clone() const override; /** * Formats a Number using the wrapped LocalizedNumberFormatter. The provided formattable must be a * number type. */ UnicodeString& format(const Formattable& obj, UnicodeString& appendTo, FieldPosition& pos, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; /** * Formats a Number using the wrapped LocalizedNumberFormatter. The provided formattable must be a * number type. */ UnicodeString& format(const Formattable& obj, UnicodeString& appendTo, FieldPositionIterator* posIter, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; /** * Not supported: sets an error index and returns. */ void parseObject(const UnicodeString& source, Formattable& result, - ParsePosition& parse_pos) const U_OVERRIDE; + ParsePosition& parse_pos) const override; /** * Gets the LocalizedNumberFormatter that this wrapper class uses to format numbers. @@ -86,7 +86,7 @@ class U_I18N_API LocalizedNumberFormatterAsFormat : public Format { */ const LocalizedNumberFormatter& getNumberFormatter() const; - UClassID getDynamicClassID() const U_OVERRIDE; + UClassID getDynamicClassID() const override; static UClassID U_EXPORT2 getStaticClassID(); private: diff --git a/icu4c/source/i18n/number_compact.h b/icu4c/source/i18n/number_compact.h index 3c05e0d3bd5..aee1df74523 100644 --- a/icu4c/source/i18n/number_compact.h +++ b/icu4c/source/i18n/number_compact.h @@ -26,7 +26,7 @@ class CompactData : public MultiplierProducer { void populate(const Locale &locale, const char *nsName, CompactStyle compactStyle, CompactType compactType, UErrorCode &status); - int32_t getMultiplier(int32_t magnitude) const U_OVERRIDE; + int32_t getMultiplier(int32_t magnitude) const override; const char16_t *getPattern( int32_t magnitude, @@ -45,7 +45,7 @@ class CompactData : public MultiplierProducer { public: explicit CompactDataSink(CompactData &data) : data(data) {} - void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE; + void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override; private: CompactData &data; @@ -70,10 +70,10 @@ class CompactHandler : public MicroPropsGenerator, public UMemory { const MicroPropsGenerator *parent, UErrorCode &status); - ~CompactHandler() U_OVERRIDE; + ~CompactHandler() override; void - processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const U_OVERRIDE; + processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const override; private: const PluralRules *rules; diff --git a/icu4c/source/i18n/number_decimalquantity.h b/icu4c/source/i18n/number_decimalquantity.h index 862addf5d6c..bd481821e80 100644 --- a/icu4c/source/i18n/number_decimalquantity.h +++ b/icu4c/source/i18n/number_decimalquantity.h @@ -195,10 +195,10 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory { Signum signum() const; /** @return Whether the value represented by this {@link DecimalQuantity} is infinite. */ - bool isInfinite() const U_OVERRIDE; + bool isInfinite() const override; /** @return Whether the value represented by this {@link DecimalQuantity} is not a number. */ - bool isNaN() const U_OVERRIDE; + bool isNaN() const override; /** * Note: this method incorporates the value of {@code exponent} @@ -267,9 +267,9 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory { */ void appendDigit(int8_t value, int32_t leadingZeros, bool appendAsInteger); - double getPluralOperand(PluralOperand operand) const U_OVERRIDE; + double getPluralOperand(PluralOperand operand) const override; - bool hasIntegerValue() const U_OVERRIDE; + bool hasIntegerValue() const override; /** * Gets the digit at the specified magnitude. For example, if the represented number is 12.3, diff --git a/icu4c/source/i18n/number_longnames.cpp b/icu4c/source/i18n/number_longnames.cpp index abeec2bcad4..96c6ca6bf89 100644 --- a/icu4c/source/i18n/number_longnames.cpp +++ b/icu4c/source/i18n/number_longnames.cpp @@ -258,7 +258,7 @@ class InflectedPluralSink : public ResourceSink { } // See ResourceSink::put(). - void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE { + void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override { int32_t pluralIndex = getIndex(key, status); if (U_FAILURE(status)) { return; } if (!outArray[pluralIndex].isBogus()) { @@ -384,7 +384,7 @@ class PluralTableSink : public ResourceSink { } } - void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE { + void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override { if (uprv_strcmp(key, "case") == 0) { return; } diff --git a/icu4c/source/i18n/number_longnames.h b/icu4c/source/i18n/number_longnames.h index 06949989d7f..56d8c9b24e8 100644 --- a/icu4c/source/i18n/number_longnames.h +++ b/icu4c/source/i18n/number_longnames.h @@ -71,9 +71,9 @@ class LongNameHandler : public MicroPropsGenerator, public ModifierStore, public * on the plural form. */ void - processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const U_OVERRIDE; + processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const override; - const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE; + const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const override; private: // A set of pre-computed modifiers, one for each plural form. @@ -168,12 +168,12 @@ class MixedUnitLongNameHandler : public MicroPropsGenerator, public ModifierStor * provided via `micros.mixedMeasures`. */ void processQuantity(DecimalQuantity &quantity, MicroProps µs, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; // Required for ModifierStore. And ModifierStore is required by // SimpleModifier constructor's last parameter. We assert his will never get // called though. - const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE; + const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const override; private: // Not owned @@ -241,7 +241,7 @@ class LongNameMultiplexer : public MicroPropsGenerator, public UMemory { // The output unit must be provided via `micros.outputUnit`, it must match // one of the units provided to the factory function. void processQuantity(DecimalQuantity &quantity, MicroProps µs, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; private: /** diff --git a/icu4c/source/i18n/number_mapper.h b/icu4c/source/i18n/number_mapper.h index 8879b7a94ea..c01607e5688 100644 --- a/icu4c/source/i18n/number_mapper.h +++ b/icu4c/source/i18n/number_mapper.h @@ -38,25 +38,25 @@ class PropertiesAffixPatternProvider : public AffixPatternProvider, public UMemo // AffixPatternProvider Methods: - char16_t charAt(int32_t flags, int32_t i) const U_OVERRIDE; + char16_t charAt(int32_t flags, int32_t i) const override; - int32_t length(int32_t flags) const U_OVERRIDE; + int32_t length(int32_t flags) const override; - UnicodeString getString(int32_t flags) const U_OVERRIDE; + UnicodeString getString(int32_t flags) const override; - bool hasCurrencySign() const U_OVERRIDE; + bool hasCurrencySign() const override; - bool positiveHasPlusSign() const U_OVERRIDE; + bool positiveHasPlusSign() const override; - bool hasNegativeSubpattern() const U_OVERRIDE; + bool hasNegativeSubpattern() const override; - bool negativeHasMinusSign() const U_OVERRIDE; + bool negativeHasMinusSign() const override; - bool containsSymbolType(AffixPatternType, UErrorCode&) const U_OVERRIDE; + bool containsSymbolType(AffixPatternType, UErrorCode&) const override; - bool hasBody() const U_OVERRIDE; + bool hasBody() const override; - bool currencyAsDecimal() const U_OVERRIDE; + bool currencyAsDecimal() const override; private: UnicodeString posPrefix; @@ -92,25 +92,25 @@ class CurrencyPluralInfoAffixProvider : public AffixPatternProvider, public UMem // AffixPatternProvider Methods: - char16_t charAt(int32_t flags, int32_t i) const U_OVERRIDE; + char16_t charAt(int32_t flags, int32_t i) const override; - int32_t length(int32_t flags) const U_OVERRIDE; + int32_t length(int32_t flags) const override; - UnicodeString getString(int32_t flags) const U_OVERRIDE; + UnicodeString getString(int32_t flags) const override; - bool hasCurrencySign() const U_OVERRIDE; + bool hasCurrencySign() const override; - bool positiveHasPlusSign() const U_OVERRIDE; + bool positiveHasPlusSign() const override; - bool hasNegativeSubpattern() const U_OVERRIDE; + bool hasNegativeSubpattern() const override; - bool negativeHasMinusSign() const U_OVERRIDE; + bool negativeHasMinusSign() const override; - bool containsSymbolType(AffixPatternType, UErrorCode&) const U_OVERRIDE; + bool containsSymbolType(AffixPatternType, UErrorCode&) const override; - bool hasBody() const U_OVERRIDE; + bool hasBody() const override; - bool currencyAsDecimal() const U_OVERRIDE; + bool currencyAsDecimal() const override; private: PropertiesAffixPatternProvider affixesByPlural[StandardPlural::COUNT]; diff --git a/icu4c/source/i18n/number_microprops.h b/icu4c/source/i18n/number_microprops.h index 8d213548d1d..18addaae087 100644 --- a/icu4c/source/i18n/number_microprops.h +++ b/icu4c/source/i18n/number_microprops.h @@ -168,7 +168,7 @@ struct MicroProps : public MicroPropsGenerator { * not already `*this`, it will be overwritten with a copy of `*this`. */ void processQuantity(DecimalQuantity &quantity, MicroProps µs, - UErrorCode &status) const U_OVERRIDE { + UErrorCode &status) const override { (void) quantity; (void) status; if (this == µs) { diff --git a/icu4c/source/i18n/number_modifiers.h b/icu4c/source/i18n/number_modifiers.h index fa8dd52913e..5f43827265f 100644 --- a/icu4c/source/i18n/number_modifiers.h +++ b/icu4c/source/i18n/number_modifiers.h @@ -29,19 +29,19 @@ class U_I18N_API ConstantAffixModifier : public Modifier, public UObject { : fPrefix(prefix), fSuffix(suffix), fField(field), fStrong(strong) {} int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; - int32_t getPrefixLength() const U_OVERRIDE; + int32_t getPrefixLength() const override; - int32_t getCodePointCount() const U_OVERRIDE; + int32_t getCodePointCount() const override; - bool isStrong() const U_OVERRIDE; + bool isStrong() const override; - bool containsField(Field field) const U_OVERRIDE; + bool containsField(Field field) const override; - void getParameters(Parameters& output) const U_OVERRIDE; + void getParameters(Parameters& output) const override; - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; + bool semanticallyEquivalent(const Modifier& other) const override; private: UnicodeString fPrefix; @@ -65,19 +65,19 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory { SimpleModifier(); int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; - int32_t getPrefixLength() const U_OVERRIDE; + int32_t getPrefixLength() const override; - int32_t getCodePointCount() const U_OVERRIDE; + int32_t getCodePointCount() const override; - bool isStrong() const U_OVERRIDE; + bool isStrong() const override; - bool containsField(Field field) const U_OVERRIDE; + bool containsField(Field field) const override; - void getParameters(Parameters& output) const U_OVERRIDE; + void getParameters(Parameters& output) const override; - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; + bool semanticallyEquivalent(const Modifier& other) const override; /** * TODO: This belongs in SimpleFormatterImpl. The only reason I haven't moved it there yet is because @@ -158,19 +158,19 @@ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory { fStrong(strong) {} int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; - int32_t getPrefixLength() const U_OVERRIDE; + int32_t getPrefixLength() const override; - int32_t getCodePointCount() const U_OVERRIDE; + int32_t getCodePointCount() const override; - bool isStrong() const U_OVERRIDE; + bool isStrong() const override; - bool containsField(Field field) const U_OVERRIDE; + bool containsField(Field field) const override; - void getParameters(Parameters& output) const U_OVERRIDE; + void getParameters(Parameters& output) const override; - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; + bool semanticallyEquivalent(const Modifier& other) const override; protected: // NOTE: In Java, these are stored as array pointers. In C++, the FormattedStringBuilder is stored by @@ -195,7 +195,7 @@ class U_I18N_API CurrencySpacingEnabledModifier : public ConstantMultiFieldModif UErrorCode &status); int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; /** Unsafe code path */ static int32_t @@ -235,7 +235,7 @@ class U_I18N_API EmptyModifier : public Modifier, public UMemory { explicit EmptyModifier(bool isStrong) : fStrong(isStrong) {} int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE { + UErrorCode &status) const override { (void)output; (void)leftIndex; (void)rightIndex; @@ -243,28 +243,28 @@ class U_I18N_API EmptyModifier : public Modifier, public UMemory { return 0; } - int32_t getPrefixLength() const U_OVERRIDE { + int32_t getPrefixLength() const override { return 0; } - int32_t getCodePointCount() const U_OVERRIDE { + int32_t getCodePointCount() const override { return 0; } - bool isStrong() const U_OVERRIDE { + bool isStrong() const override { return fStrong; } - bool containsField(Field field) const U_OVERRIDE { + bool containsField(Field field) const override { (void)field; return false; } - void getParameters(Parameters& output) const U_OVERRIDE { + void getParameters(Parameters& output) const override { output.obj = nullptr; } - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE { + bool semanticallyEquivalent(const Modifier& other) const override { return other.getCodePointCount() == 0; } @@ -332,7 +332,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory { } /** Returns a reference to the modifier; no ownership change. */ - const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE { + const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const override { const Modifier* modifier = mods[plural][signum]; if (modifier == nullptr && plural != DEFAULT_STANDARD_PLURAL) { modifier = mods[DEFAULT_STANDARD_PLURAL][signum]; diff --git a/icu4c/source/i18n/number_multiplier.h b/icu4c/source/i18n/number_multiplier.h index d8235dc601b..c752935b783 100644 --- a/icu4c/source/i18n/number_multiplier.h +++ b/icu4c/source/i18n/number_multiplier.h @@ -25,7 +25,7 @@ class U_I18N_API MultiplierFormatHandler : public MicroPropsGenerator, public UM void setAndChain(const Scale& multiplier, const MicroPropsGenerator* parent); void processQuantity(DecimalQuantity& quantity, MicroProps& micros, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; private: Scale fMultiplier; diff --git a/icu4c/source/i18n/number_patternmodifier.h b/icu4c/source/i18n/number_patternmodifier.h index 45a72669ace..ee38c20c9c9 100644 --- a/icu4c/source/i18n/number_patternmodifier.h +++ b/icu4c/source/i18n/number_patternmodifier.h @@ -42,9 +42,9 @@ class MutablePatternModifier; // Exported as U_I18N_API because it is needed for the unit test PatternModifierTest class U_I18N_API ImmutablePatternModifier : public MicroPropsGenerator, public UMemory { public: - ~ImmutablePatternModifier() U_OVERRIDE = default; + ~ImmutablePatternModifier() override = default; - void processQuantity(DecimalQuantity&, MicroProps& micros, UErrorCode& status) const U_OVERRIDE; + void processQuantity(DecimalQuantity&, MicroProps& micros, UErrorCode& status) const override; void applyToMicros(MicroProps& micros, const DecimalQuantity& quantity, UErrorCode& status) const; @@ -89,7 +89,7 @@ class U_I18N_API MutablePatternModifier public UMemory { public: - ~MutablePatternModifier() U_OVERRIDE = default; + ~MutablePatternModifier() override = default; /** * @param isStrong @@ -176,27 +176,27 @@ class U_I18N_API MutablePatternModifier MicroPropsGenerator &addToChain(const MicroPropsGenerator *parent); - void processQuantity(DecimalQuantity &, MicroProps µs, UErrorCode &status) const U_OVERRIDE; + void processQuantity(DecimalQuantity &, MicroProps µs, UErrorCode &status) const override; int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; - int32_t getPrefixLength() const U_OVERRIDE; + int32_t getPrefixLength() const override; - int32_t getCodePointCount() const U_OVERRIDE; + int32_t getCodePointCount() const override; - bool isStrong() const U_OVERRIDE; + bool isStrong() const override; - bool containsField(Field field) const U_OVERRIDE; + bool containsField(Field field) const override; - void getParameters(Parameters& output) const U_OVERRIDE; + void getParameters(Parameters& output) const override; - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; + bool semanticallyEquivalent(const Modifier& other) const override; /** * Returns the string that substitutes a given symbol type in a pattern. */ - UnicodeString getSymbol(AffixPatternType type) const U_OVERRIDE; + UnicodeString getSymbol(AffixPatternType type) const override; /** * Returns the currency symbol for the unit width specified in setSymbols() diff --git a/icu4c/source/i18n/number_patternstring.h b/icu4c/source/i18n/number_patternstring.h index 08696697847..f5650e2336d 100644 --- a/icu4c/source/i18n/number_patternstring.h +++ b/icu4c/source/i18n/number_patternstring.h @@ -80,32 +80,32 @@ struct U_I18N_API ParsedPatternInfo : public AffixPatternProvider, public UMemor ParsedPatternInfo() : state(this->pattern), currentSubpattern(nullptr) {} - ~ParsedPatternInfo() U_OVERRIDE = default; + ~ParsedPatternInfo() override = default; // Need to declare this explicitly because of the destructor ParsedPatternInfo& operator=(ParsedPatternInfo&& src) U_NOEXCEPT = default; static int32_t getLengthFromEndpoints(const Endpoints& endpoints); - char16_t charAt(int32_t flags, int32_t index) const U_OVERRIDE; + char16_t charAt(int32_t flags, int32_t index) const override; - int32_t length(int32_t flags) const U_OVERRIDE; + int32_t length(int32_t flags) const override; - UnicodeString getString(int32_t flags) const U_OVERRIDE; + UnicodeString getString(int32_t flags) const override; - bool positiveHasPlusSign() const U_OVERRIDE; + bool positiveHasPlusSign() const override; - bool hasNegativeSubpattern() const U_OVERRIDE; + bool hasNegativeSubpattern() const override; - bool negativeHasMinusSign() const U_OVERRIDE; + bool negativeHasMinusSign() const override; - bool hasCurrencySign() const U_OVERRIDE; + bool hasCurrencySign() const override; - bool containsSymbolType(AffixPatternType type, UErrorCode& status) const U_OVERRIDE; + bool containsSymbolType(AffixPatternType type, UErrorCode& status) const override; - bool hasBody() const U_OVERRIDE; + bool hasBody() const override; - bool currencyAsDecimal() const U_OVERRIDE; + bool currencyAsDecimal() const override; private: struct U_I18N_API ParserState { diff --git a/icu4c/source/i18n/number_scientific.h b/icu4c/source/i18n/number_scientific.h index a40a6e416d1..22140a09afc 100644 --- a/icu4c/source/i18n/number_scientific.h +++ b/icu4c/source/i18n/number_scientific.h @@ -22,19 +22,19 @@ class U_I18N_API ScientificModifier : public UMemory, public Modifier { void set(int32_t exponent, const ScientificHandler *handler); int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; - int32_t getPrefixLength() const U_OVERRIDE; + int32_t getPrefixLength() const override; - int32_t getCodePointCount() const U_OVERRIDE; + int32_t getCodePointCount() const override; - bool isStrong() const U_OVERRIDE; + bool isStrong() const override; - bool containsField(Field field) const U_OVERRIDE; + bool containsField(Field field) const override; - void getParameters(Parameters& output) const U_OVERRIDE; + void getParameters(Parameters& output) const override; - bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; + bool semanticallyEquivalent(const Modifier& other) const override; private: int32_t fExponent; @@ -47,9 +47,9 @@ class ScientificHandler : public UMemory, public MicroPropsGenerator, public Mul const MicroPropsGenerator *parent); void - processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const U_OVERRIDE; + processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const override; - int32_t getMultiplier(int32_t magnitude) const U_OVERRIDE; + int32_t getMultiplier(int32_t magnitude) const override; private: const Notation::ScientificSettings fSettings; diff --git a/icu4c/source/i18n/number_usageprefs.h b/icu4c/source/i18n/number_usageprefs.h index 70547225a00..e90df99d396 100644 --- a/icu4c/source/i18n/number_usageprefs.h +++ b/icu4c/source/i18n/number_usageprefs.h @@ -44,7 +44,7 @@ class U_I18N_API UsagePrefsHandler : public MicroPropsGenerator, public UMemory * micros.outputUnit. */ void processQuantity(DecimalQuantity &quantity, MicroProps µs, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; /** * Returns the list of possible output units, i.e. the full set of @@ -111,7 +111,7 @@ class U_I18N_API UnitConversionHandler : public MicroPropsGenerator, public UMem * Obtains the appropriate output values from the Unit Converter. */ void processQuantity(DecimalQuantity &quantity, MicroProps µs, - UErrorCode &status) const U_OVERRIDE; + UErrorCode &status) const override; private: MeasureUnit fOutputUnit; LocalPointer fUnitConverter; diff --git a/icu4c/source/i18n/numparse_validators.h b/icu4c/source/i18n/numparse_validators.h index 5d43b779d0b..9bb4b482b55 100644 --- a/icu4c/source/i18n/numparse_validators.h +++ b/icu4c/source/i18n/numparse_validators.h @@ -16,33 +16,33 @@ namespace impl { class ValidationMatcher : public NumberParseMatcher { public: - bool match(StringSegment&, ParsedNumber&, UErrorCode&) const U_OVERRIDE { + bool match(StringSegment&, ParsedNumber&, UErrorCode&) const override { // No-op return false; } - bool smokeTest(const StringSegment&) const U_OVERRIDE { + bool smokeTest(const StringSegment&) const override { // No-op return false; } - void postProcess(ParsedNumber& result) const U_OVERRIDE = 0; + void postProcess(ParsedNumber& result) const override = 0; }; class RequireAffixValidator : public ValidationMatcher, public UMemory { public: - void postProcess(ParsedNumber& result) const U_OVERRIDE; + void postProcess(ParsedNumber& result) const override; - UnicodeString toString() const U_OVERRIDE; + UnicodeString toString() const override; }; class RequireCurrencyValidator : public ValidationMatcher, public UMemory { public: - void postProcess(ParsedNumber& result) const U_OVERRIDE; + void postProcess(ParsedNumber& result) const override; - UnicodeString toString() const U_OVERRIDE; + UnicodeString toString() const override; }; @@ -52,9 +52,9 @@ class RequireDecimalSeparatorValidator : public ValidationMatcher, public UMemor RequireDecimalSeparatorValidator(bool patternHasDecimalSeparator); - void postProcess(ParsedNumber& result) const U_OVERRIDE; + void postProcess(ParsedNumber& result) const override; - UnicodeString toString() const U_OVERRIDE; + UnicodeString toString() const override; private: bool fPatternHasDecimalSeparator; @@ -63,9 +63,9 @@ class RequireDecimalSeparatorValidator : public ValidationMatcher, public UMemor class RequireNumberValidator : public ValidationMatcher, public UMemory { public: - void postProcess(ParsedNumber& result) const U_OVERRIDE; + void postProcess(ParsedNumber& result) const override; - UnicodeString toString() const U_OVERRIDE; + UnicodeString toString() const override; }; @@ -78,9 +78,9 @@ class MultiplierParseHandler : public ValidationMatcher, public UMemory { MultiplierParseHandler(::icu::number::Scale multiplier); - void postProcess(ParsedNumber& result) const U_OVERRIDE; + void postProcess(ParsedNumber& result) const override; - UnicodeString toString() const U_OVERRIDE; + UnicodeString toString() const override; private: ::icu::number::Scale fMultiplier; diff --git a/icu4c/source/i18n/numrange_impl.cpp b/icu4c/source/i18n/numrange_impl.cpp index 19453ea3a3f..002a8b2a210 100644 --- a/icu4c/source/i18n/numrange_impl.cpp +++ b/icu4c/source/i18n/numrange_impl.cpp @@ -38,7 +38,7 @@ class NumberRangeDataSink : public ResourceSink { public: NumberRangeDataSink(NumberRangeData& data) : fData(data) {} - void put(const char* key, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) U_OVERRIDE { + void put(const char* key, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) override { ResourceTable miscTable = value.getTable(status); if (U_FAILURE(status)) { return; } for (int i = 0; miscTable.getKeyAndValue(i, key, value); i++) { diff --git a/icu4c/source/i18n/pluralranges.cpp b/icu4c/source/i18n/pluralranges.cpp index 6e7d0d33258..403836f6275 100644 --- a/icu4c/source/i18n/pluralranges.cpp +++ b/icu4c/source/i18n/pluralranges.cpp @@ -26,7 +26,7 @@ class PluralRangesDataSink : public ResourceSink { public: PluralRangesDataSink(StandardPluralRanges& output) : fOutput(output) {} - void put(const char* /*key*/, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) U_OVERRIDE { + void put(const char* /*key*/, ResourceValue& value, UBool /*noFallback*/, UErrorCode& status) override { ResourceArray entriesArray = value.getArray(status); if (U_FAILURE(status)) { return; } fOutput.setCapacity(entriesArray.getSize(), status); diff --git a/icu4c/source/i18n/plurrule_impl.h b/icu4c/source/i18n/plurrule_impl.h index e07ebe34395..bf86dd1f440 100644 --- a/icu4c/source/i18n/plurrule_impl.h +++ b/icu4c/source/i18n/plurrule_impl.h @@ -299,16 +299,16 @@ class U_I18N_API FixedDecimal: public IFixedDecimal, public UObject { FixedDecimal(double n, int32_t); explicit FixedDecimal(double n); FixedDecimal(); - ~FixedDecimal() U_OVERRIDE; + ~FixedDecimal() override; FixedDecimal(const UnicodeString &s, UErrorCode &ec); FixedDecimal(const FixedDecimal &other); static FixedDecimal createWithExponent(double n, int32_t v, int32_t e); - double getPluralOperand(PluralOperand operand) const U_OVERRIDE; - bool isNaN() const U_OVERRIDE; - bool isInfinite() const U_OVERRIDE; - bool hasIntegerValue() const U_OVERRIDE; + double getPluralOperand(PluralOperand operand) const override; + bool isNaN() const override; + bool isInfinite() const override; + bool hasIntegerValue() const override; bool isNanOrInfinity() const; // used in decimfmtimpl.cpp diff --git a/icu4c/source/i18n/unicode/compactdecimalformat.h b/icu4c/source/i18n/unicode/compactdecimalformat.h index 02b0cb22fb3..0cbf3d4c73a 100644 --- a/icu4c/source/i18n/unicode/compactdecimalformat.h +++ b/icu4c/source/i18n/unicode/compactdecimalformat.h @@ -88,7 +88,7 @@ public: * Destructor. * @stable ICU 51 */ - ~CompactDecimalFormat() U_OVERRIDE; + ~CompactDecimalFormat() override; /** * Assignment operator. @@ -105,7 +105,7 @@ public: * @return a polymorphic copy of this CompactDecimalFormat. * @stable ICU 51 */ - CompactDecimalFormat* clone() const U_OVERRIDE; + CompactDecimalFormat* clone() const override; using DecimalFormat::format; @@ -119,7 +119,7 @@ public: * @stable ICU 51 */ void parse(const UnicodeString& text, Formattable& result, - ParsePosition& parsePosition) const U_OVERRIDE; + ParsePosition& parsePosition) const override; /** * CompactDecimalFormat does not support parsing. This implementation @@ -130,7 +130,7 @@ public: * @param status Always set to U_UNSUPPORTED_ERROR. * @stable ICU 51 */ - void parse(const UnicodeString& text, Formattable& result, UErrorCode& status) const U_OVERRIDE; + void parse(const UnicodeString& text, Formattable& result, UErrorCode& status) const override; #ifndef U_HIDE_INTERNAL_API /** @@ -153,7 +153,7 @@ public: * the parsed currency; if parse fails, this is nullptr. * @internal */ - CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const U_OVERRIDE; + CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const override; #endif /* U_HIDE_INTERNAL_API */ /** @@ -180,7 +180,7 @@ public: * other classes have different class IDs. * @stable ICU 51 */ - UClassID getDynamicClassID() const U_OVERRIDE; + UClassID getDynamicClassID() const override; private: CompactDecimalFormat(const Locale& inLocale, UNumberCompactStyle style, UErrorCode& status); diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h index dffedab48d0..f72ba687258 100644 --- a/icu4c/source/i18n/unicode/decimfmt.h +++ b/icu4c/source/i18n/unicode/decimfmt.h @@ -803,7 +803,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see getGroupingUsed * @stable ICU 53 */ - void setGroupingUsed(UBool newValue) U_OVERRIDE; + void setGroupingUsed(UBool newValue) override; /** * Sets whether or not numbers should be parsed as integers only. @@ -812,7 +812,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see isParseIntegerOnly * @stable ICU 53 */ - void setParseIntegerOnly(UBool value) U_OVERRIDE; + void setParseIntegerOnly(UBool value) override; /** * Sets whether lenient parsing should be enabled (it is off by default). @@ -821,7 +821,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * \c false otherwise. * @stable ICU 4.8 */ - void setLenient(UBool enable) U_OVERRIDE; + void setLenient(UBool enable) override; /** * Create a DecimalFormat from the given pattern and symbols. @@ -890,7 +890,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * Destructor. * @stable ICU 2.0 */ - ~DecimalFormat() U_OVERRIDE; + ~DecimalFormat() override; /** * Clone this Format object polymorphically. The caller owns the @@ -899,7 +899,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return a polymorphic copy of this DecimalFormat. * @stable ICU 2.0 */ - DecimalFormat* clone() const U_OVERRIDE; + DecimalFormat* clone() const override; /** * Return true if the given Format objects are semantically equal. @@ -909,7 +909,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return true if the given Format objects are semantically equal. * @stable ICU 2.0 */ - bool operator==(const Format& other) const U_OVERRIDE; + bool operator==(const Format& other) const override; using NumberFormat::format; @@ -925,7 +925,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return Reference to 'appendTo' parameter. * @stable ICU 2.0 */ - UnicodeString& format(double number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE; + UnicodeString& format(double number, UnicodeString& appendTo, FieldPosition& pos) const override; #ifndef U_HIDE_INTERNAL_API /** @@ -941,7 +941,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @internal */ UnicodeString& format(double number, UnicodeString& appendTo, FieldPosition& pos, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; #endif /* U_HIDE_INTERNAL_API */ /** @@ -958,7 +958,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @stable ICU 4.4 */ UnicodeString& format(double number, UnicodeString& appendTo, FieldPositionIterator* posIter, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; /** * Format a long number using base-10 representation. @@ -971,7 +971,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return Reference to 'appendTo' parameter. * @stable ICU 2.0 */ - UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE; + UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPosition& pos) const override; #ifndef U_HIDE_INTERNAL_API /** @@ -987,7 +987,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @internal */ UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPosition& pos, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; #endif /* U_HIDE_INTERNAL_API */ /** @@ -1004,7 +1004,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @stable ICU 4.4 */ UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPositionIterator* posIter, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; /** * Format an int64 number using base-10 representation. @@ -1017,7 +1017,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return Reference to 'appendTo' parameter. * @stable ICU 2.8 */ - UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE; + UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPosition& pos) const override; #ifndef U_HIDE_INTERNAL_API /** @@ -1033,7 +1033,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @internal */ UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPosition& pos, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; #endif /* U_HIDE_INTERNAL_API */ /** @@ -1050,7 +1050,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @stable ICU 4.4 */ UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPositionIterator* posIter, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; /** * Format a decimal number. @@ -1069,7 +1069,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @stable ICU 4.4 */ UnicodeString& format(StringPiece number, UnicodeString& appendTo, FieldPositionIterator* posIter, - UErrorCode& status) const U_OVERRIDE; + UErrorCode& status) const override; #ifndef U_HIDE_INTERNAL_API @@ -1089,7 +1089,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @internal */ UnicodeString& format(const number::impl::DecimalQuantity& number, UnicodeString& appendTo, - FieldPositionIterator* posIter, UErrorCode& status) const U_OVERRIDE; + FieldPositionIterator* posIter, UErrorCode& status) const override; /** * Format a decimal number. @@ -1107,7 +1107,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @internal */ UnicodeString& format(const number::impl::DecimalQuantity& number, UnicodeString& appendTo, - FieldPosition& pos, UErrorCode& status) const U_OVERRIDE; + FieldPosition& pos, UErrorCode& status) const override; #endif // U_HIDE_INTERNAL_API @@ -1133,7 +1133,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @stable ICU 2.0 */ void parse(const UnicodeString& text, Formattable& result, - ParsePosition& parsePosition) const U_OVERRIDE; + ParsePosition& parsePosition) const override; /** * Parses text from the given string as a currency amount. Unlike @@ -1154,7 +1154,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * the parsed currency; if parse fails, this is nullptr. * @stable ICU 49 */ - CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const U_OVERRIDE; + CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const override; /** * Returns the decimal format symbols, which is generally not changed @@ -1399,7 +1399,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see #setRoundingMode * @stable ICU 2.0 */ - virtual ERoundingMode getRoundingMode(void) const U_OVERRIDE; + virtual ERoundingMode getRoundingMode(void) const override; /** * Set the rounding mode. @@ -1409,7 +1409,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see #getRoundingMode * @stable ICU 2.0 */ - virtual void setRoundingMode(ERoundingMode roundingMode) U_OVERRIDE; + virtual void setRoundingMode(ERoundingMode roundingMode) override; /** * Get the width to which the output of format() is padded. @@ -1910,7 +1910,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see NumberFormat#setMaximumIntegerDigits * @stable ICU 2.0 */ - void setMaximumIntegerDigits(int32_t newValue) U_OVERRIDE; + void setMaximumIntegerDigits(int32_t newValue) override; /** * Sets the minimum number of digits allowed in the integer portion of a @@ -1921,7 +1921,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see NumberFormat#setMinimumIntegerDigits * @stable ICU 2.0 */ - void setMinimumIntegerDigits(int32_t newValue) U_OVERRIDE; + void setMinimumIntegerDigits(int32_t newValue) override; /** * Sets the maximum number of digits allowed in the fraction portion of a @@ -1932,7 +1932,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see NumberFormat#setMaximumFractionDigits * @stable ICU 2.0 */ - void setMaximumFractionDigits(int32_t newValue) U_OVERRIDE; + void setMaximumFractionDigits(int32_t newValue) override; /** * Sets the minimum number of digits allowed in the fraction portion of a @@ -1943,7 +1943,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @see NumberFormat#setMinimumFractionDigits * @stable ICU 2.0 */ - void setMinimumFractionDigits(int32_t newValue) U_OVERRIDE; + void setMinimumFractionDigits(int32_t newValue) override; /** * Returns the minimum number of significant digits that will be @@ -2018,7 +2018,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @param ec input-output error code * @stable ICU 3.0 */ - void setCurrency(const char16_t* theCurrency, UErrorCode& ec) U_OVERRIDE; + void setCurrency(const char16_t* theCurrency, UErrorCode& ec) override; #ifndef U_FORCE_HIDE_DEPRECATED_API /** @@ -2137,7 +2137,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * other classes have different class IDs. * @stable ICU 2.0 */ - UClassID getDynamicClassID(void) const U_OVERRIDE; + UClassID getDynamicClassID(void) const override; private: diff --git a/icu4c/source/i18n/unicode/dtitvfmt.h b/icu4c/source/i18n/unicode/dtitvfmt.h index 1d1b7d73c37..d383f975c07 100644 --- a/icu4c/source/i18n/unicode/dtitvfmt.h +++ b/icu4c/source/i18n/unicode/dtitvfmt.h @@ -74,7 +74,7 @@ class U_I18N_API FormattedDateInterval : public UMemory, public FormattedValue { * Destruct an instance of FormattedDateInterval. * @stable ICU 64 */ - virtual ~FormattedDateInterval() U_OVERRIDE; + virtual ~FormattedDateInterval() override; /** Copying not supported; use move constructor instead. */ FormattedDateInterval(const FormattedDateInterval&) = delete; @@ -89,16 +89,16 @@ class U_I18N_API FormattedDateInterval : public UMemory, public FormattedValue { FormattedDateInterval& operator=(FormattedDateInterval&& src) U_NOEXCEPT; /** @copydoc FormattedValue::toString() */ - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; /** @copydoc FormattedValue::toTempString() */ - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toTempString(UErrorCode& status) const override; /** @copydoc FormattedValue::appendTo() */ - Appendable &appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; + Appendable &appendTo(Appendable& appendable, UErrorCode& status) const override; /** @copydoc FormattedValue::nextPosition() */ - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; private: FormattedDateIntervalData *fData; diff --git a/icu4c/source/i18n/unicode/formattednumber.h b/icu4c/source/i18n/unicode/formattednumber.h index af72862579d..d6c7a0b12c6 100644 --- a/icu4c/source/i18n/unicode/formattednumber.h +++ b/icu4c/source/i18n/unicode/formattednumber.h @@ -64,7 +64,7 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * Destruct an instance of FormattedNumber. * @stable ICU 60 */ - virtual ~FormattedNumber() U_OVERRIDE; + virtual ~FormattedNumber() override; /** Copying not supported; use move constructor instead. */ FormattedNumber(const FormattedNumber&) = delete; @@ -86,11 +86,11 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * * @stable ICU 62 */ - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; // Copydoc: this method is new in ICU 64 /** @copydoc FormattedValue::toTempString() */ - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toTempString(UErrorCode& status) const override; // Copybrief: this method is older than the parent method /** @@ -100,11 +100,11 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * * @stable ICU 62 */ - Appendable &appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; + Appendable &appendTo(Appendable& appendable, UErrorCode& status) const override; // Copydoc: this method is new in ICU 64 /** @copydoc FormattedValue::nextPosition() */ - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; /** * Export the formatted number as a "numeric string" conforming to the diff --git a/icu4c/source/i18n/unicode/listformatter.h b/icu4c/source/i18n/unicode/listformatter.h index 0277afd1671..171b4e87141 100644 --- a/icu4c/source/i18n/unicode/listformatter.h +++ b/icu4c/source/i18n/unicode/listformatter.h @@ -101,7 +101,7 @@ class U_I18N_API FormattedList : public UMemory, public FormattedValue { * Destruct an instance of FormattedList. * @stable ICU 64 */ - virtual ~FormattedList() U_OVERRIDE; + virtual ~FormattedList() override; /** Copying not supported; use move constructor instead. */ FormattedList(const FormattedList&) = delete; @@ -116,16 +116,16 @@ class U_I18N_API FormattedList : public UMemory, public FormattedValue { FormattedList& operator=(FormattedList&& src) U_NOEXCEPT; /** @copydoc FormattedValue::toString() */ - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; /** @copydoc FormattedValue::toTempString() */ - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toTempString(UErrorCode& status) const override; /** @copydoc FormattedValue::appendTo() */ - Appendable &appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; + Appendable &appendTo(Appendable& appendable, UErrorCode& status) const override; /** @copydoc FormattedValue::nextPosition() */ - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; private: FormattedListData *fData; diff --git a/icu4c/source/i18n/unicode/numberrangeformatter.h b/icu4c/source/i18n/unicode/numberrangeformatter.h index ef119a64f77..1b26bc73950 100644 --- a/icu4c/source/i18n/unicode/numberrangeformatter.h +++ b/icu4c/source/i18n/unicode/numberrangeformatter.h @@ -593,11 +593,11 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * * @stable ICU 63 */ - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; // Copydoc: this method is new in ICU 64 /** @copydoc FormattedValue::toTempString() */ - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toTempString(UErrorCode& status) const override; // Copybrief: this method is older than the parent method /** @@ -607,11 +607,11 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * * @stable ICU 63 */ - Appendable &appendTo(Appendable &appendable, UErrorCode& status) const U_OVERRIDE; + Appendable &appendTo(Appendable &appendable, UErrorCode& status) const override; // Copydoc: this method is new in ICU 64 /** @copydoc FormattedValue::nextPosition() */ - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; /** * Extracts the formatted range as a pair of decimal numbers. This endpoint diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h index 82a4eb77833..e5fca2deab5 100644 --- a/icu4c/source/i18n/unicode/reldatefmt.h +++ b/icu4c/source/i18n/unicode/reldatefmt.h @@ -289,7 +289,7 @@ class U_I18N_API FormattedRelativeDateTime : public UMemory, public FormattedVal * Destruct an instance of FormattedRelativeDateTime. * @stable ICU 64 */ - virtual ~FormattedRelativeDateTime() U_OVERRIDE; + virtual ~FormattedRelativeDateTime() override; /** Copying not supported; use move constructor instead. */ FormattedRelativeDateTime(const FormattedRelativeDateTime&) = delete; @@ -304,16 +304,16 @@ class U_I18N_API FormattedRelativeDateTime : public UMemory, public FormattedVal FormattedRelativeDateTime& operator=(FormattedRelativeDateTime&& src) U_NOEXCEPT; /** @copydoc FormattedValue::toString() */ - UnicodeString toString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toString(UErrorCode& status) const override; /** @copydoc FormattedValue::toTempString() */ - UnicodeString toTempString(UErrorCode& status) const U_OVERRIDE; + UnicodeString toTempString(UErrorCode& status) const override; /** @copydoc FormattedValue::appendTo() */ - Appendable &appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; + Appendable &appendTo(Appendable& appendable, UErrorCode& status) const override; /** @copydoc FormattedValue::nextPosition() */ - UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; + UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const override; private: FormattedRelativeDateTimeData *fData; diff --git a/icu4c/source/test/intltest/itutil.cpp b/icu4c/source/test/intltest/itutil.cpp index c0fc56cc0c8..a89c83f0243 100644 --- a/icu4c/source/test/intltest/itutil.cpp +++ b/icu4c/source/test/intltest/itutil.cpp @@ -202,7 +202,7 @@ void ErrorCodeTest::TestSubclass() { class IcuTestErrorCodeTestHelper : public IntlTest { public: - void errln( const UnicodeString &message ) U_OVERRIDE { + void errln( const UnicodeString &message ) override { test->assertFalse("Already saw an error", seenError); seenError = true; test->assertEquals("Message for Error", expectedErrln, message); @@ -211,7 +211,7 @@ class IcuTestErrorCodeTestHelper : public IntlTest { } } - void dataerrln( const UnicodeString &message ) U_OVERRIDE { + void dataerrln( const UnicodeString &message ) override { test->assertFalse("Already saw an error", seenError); seenError = true; test->assertEquals("Message for Error", expectedErrln, message); diff --git a/icu4c/source/test/intltest/numbertest_affixutils.cpp b/icu4c/source/test/intltest/numbertest_affixutils.cpp index 5851a9fbdaa..63359d33939 100644 --- a/icu4c/source/test/intltest/numbertest_affixutils.cpp +++ b/icu4c/source/test/intltest/numbertest_affixutils.cpp @@ -18,7 +18,7 @@ class DefaultSymbolProvider : public SymbolProvider { public: DefaultSymbolProvider(UErrorCode &status) : fSymbols(Locale("ar_SA"), status) {} - UnicodeString getSymbol(AffixPatternType type) const U_OVERRIDE { + UnicodeString getSymbol(AffixPatternType type) const override { switch (type) { case TYPE_MINUS_SIGN: return u"−"; diff --git a/icu4c/source/test/intltest/rbbimonkeytest.h b/icu4c/source/test/intltest/rbbimonkeytest.h index 837c0ca71eb..2dd99065461 100644 --- a/icu4c/source/test/intltest/rbbimonkeytest.h +++ b/icu4c/source/test/intltest/rbbimonkeytest.h @@ -217,7 +217,7 @@ class RBBIMonkeyImpl: public UObject { RBBIMonkeyImpl *fMonkeyImpl; public: RBBIMonkeyThread(RBBIMonkeyImpl *impl) : fMonkeyImpl(impl) {} - void run() U_OVERRIDE { fMonkeyImpl->runTest(); } + void run() override { fMonkeyImpl->runTest(); } }; private: void openBreakRules(const char *fileName, UErrorCode &status); diff --git a/icu4c/source/tools/gennorm2/extradata.h b/icu4c/source/tools/gennorm2/extradata.h index cd0d9403b58..0a8e73087d5 100644 --- a/icu4c/source/tools/gennorm2/extradata.h +++ b/icu4c/source/tools/gennorm2/extradata.h @@ -30,7 +30,7 @@ class ExtraData : public Norms::Enumerator { public: ExtraData(Norms &n, UBool fast); - void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE; + void rangeHandler(UChar32 start, UChar32 end, Norm &norm) override; UnicodeString maybeYesCompositions; UnicodeString yesYesCompositions; diff --git a/icu4c/source/tools/gennorm2/n2builder.cpp b/icu4c/source/tools/gennorm2/n2builder.cpp index 1de031c6bb8..a07327145d4 100644 --- a/icu4c/source/tools/gennorm2/n2builder.cpp +++ b/icu4c/source/tools/gennorm2/n2builder.cpp @@ -410,7 +410,7 @@ class Norm16Writer : public Norms::Enumerator { public: Norm16Writer(UMutableCPTrie *trie, Norms &n, Normalizer2DataBuilder &b) : Norms::Enumerator(n), builder(b), norm16Trie(trie) {} - void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE { + void rangeHandler(UChar32 start, UChar32 end, Norm &norm) override { builder.writeNorm16(norm16Trie, start, end, norm); } Normalizer2DataBuilder &builder; diff --git a/icu4c/source/tools/gennorm2/norms.h b/icu4c/source/tools/gennorm2/norms.h index e1c17b0999f..f2778d95096 100644 --- a/icu4c/source/tools/gennorm2/norms.h +++ b/icu4c/source/tools/gennorm2/norms.h @@ -197,14 +197,14 @@ class CompositionBuilder : public Norms::Enumerator { public: CompositionBuilder(Norms &n) : Norms::Enumerator(n) {} /** Adds a composition mapping for the first character in a round-trip mapping. */ - void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE; + void rangeHandler(UChar32 start, UChar32 end, Norm &norm) override; }; class Decomposer : public Norms::Enumerator { public: Decomposer(Norms &n) : Norms::Enumerator(n), didDecompose(false) {} /** Decomposes each character of the current mapping. Sets didDecompose if any. */ - void rangeHandler(UChar32 start, UChar32 end, Norm &norm) U_OVERRIDE; + void rangeHandler(UChar32 start, UChar32 end, Norm &norm) override; UBool didDecompose; }; diff --git a/tools/release/java/src/main/java/com/ibm/icu/dev/tools/docs/StableAPI.java b/tools/release/java/src/main/java/com/ibm/icu/dev/tools/docs/StableAPI.java index e2af6258954..9f53715921e 100644 --- a/tools/release/java/src/main/java/com/ibm/icu/dev/tools/docs/StableAPI.java +++ b/tools/release/java/src/main/java/com/ibm/icu/dev/tools/docs/StableAPI.java @@ -552,7 +552,7 @@ public class StableAPI { // TODO: notify about this difference, separately "[ ]*U_NOEXCEPT", "", // remove U_NOEXCEPT (this was fixed in Doxyfile, but fixing here so it is // retroactive) - "[ ]*(override|U_OVERRIDE)", "", // remove U_OVERRIDE and override + "[ ]*override", "", // remove override // Simplify possibly-covariant functions to void* "^([^\\* ]+)\\*(.*)::(clone|safeClone|cloneAsThawed|freeze|createBufferClone)\\((.*)", "void*$2::$3($4", "\\s+$", "", // remove trailing spaces. diff --git a/tools/unicode/c/genprops/layoutpropsbuilder.cpp b/tools/unicode/c/genprops/layoutpropsbuilder.cpp index 089fcc4a5d2..3ed46df91bc 100644 --- a/tools/unicode/c/genprops/layoutpropsbuilder.cpp +++ b/tools/unicode/c/genprops/layoutpropsbuilder.cpp @@ -78,12 +78,12 @@ static UDataInfo dataInfo = { class LayoutPropsBuilder : public PropsBuilder { public: LayoutPropsBuilder(UErrorCode &errorCode); - virtual ~LayoutPropsBuilder() U_OVERRIDE; + virtual ~LayoutPropsBuilder() override; - virtual void setUnicodeVersion(const UVersionInfo version) U_OVERRIDE; - virtual void setProps(const UniProps &props, const UnicodeSet &newValues, UErrorCode &errorCode) U_OVERRIDE; - virtual void build(UErrorCode &errorCode) U_OVERRIDE; - virtual void writeBinaryData(const char *path, UBool withCopyright, UErrorCode &errorCode) U_OVERRIDE; + virtual void setUnicodeVersion(const UVersionInfo version) override; + virtual void setProps(const UniProps &props, const UnicodeSet &newValues, UErrorCode &errorCode) override; + virtual void build(UErrorCode &errorCode) override; + virtual void writeBinaryData(const char *path, UBool withCopyright, UErrorCode &errorCode) override; private: void setIntProp(const UniProps &, const UnicodeSet &newValues,