ICU-13117 Changing override to U_OVERRIDE in number formatting code.

X-SVN-Rev: 40541

diff --git a/icu4c/source/i18n/number_compact.h b/icu4c/source/i18n/number_compact.h
index 0810a38e4deaf9b6c458021519bbe09e5a09e9eb..89a6c0537cef9b553c2d307a1639e61aacf0ce65 100644 (file)
--- a/icu4c/source/i18n/number_compact.h
+++ b/icu4c/source/i18n/number_compact.h
@@ -24,7 +24,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 override;
+    int32_t getMultiplier(int32_t magnitude) const U_OVERRIDE;
 
     const UChar *getPattern(int32_t magnitude, StandardPlural::Form plural) const;
 
@@ -40,7 +40,7 @@ class CompactData : public MultiplierProducer {
       public:
         explicit CompactDataSink(CompactData &data) : data(data) {}
 
-        void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) override;
+        void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE;
 
       private:
         CompactData &data;
@@ -60,10 +60,10 @@ class CompactHandler : public MicroPropsGenerator, public UMemory {
                    MutablePatternModifier *buildReference, const MicroPropsGenerator *parent,
                    UErrorCode &status);
 
-    ~CompactHandler() override;
+    ~CompactHandler() U_OVERRIDE;
 
     void
-    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const override;
+    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const U_OVERRIDE;
 
   private:
     const PluralRules *rules;

diff --git a/icu4c/source/i18n/number_decimalquantity.h b/icu4c/source/i18n/number_decimalquantity.h
index 86a5c2d56fbf229469f62ae5aa40c3f6d9224bb3..d270478a6ae20c283e04b1fc43734b71e3685389 100644 (file)
--- a/icu4c/source/i18n/number_decimalquantity.h
+++ b/icu4c/source/i18n/number_decimalquantity.h
@@ -114,10 +114,10 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory {
     bool isNegative() const;
 
     /** @return Whether the value represented by this {@link DecimalQuantity} is infinite. */
-    bool isInfinite() const override;
+    bool isInfinite() const U_OVERRIDE;
 
     /** @return Whether the value represented by this {@link DecimalQuantity} is not a number. */
-    bool isNaN() const override;
+    bool isNaN() const U_OVERRIDE;
 
     int64_t toLong() const;
 
@@ -164,7 +164,7 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory {
      */
     StandardPlural::Form getStandardPlural(const PluralRules *rules) const;
 
-    double getPluralOperand(PluralOperand operand) const override;
+    double getPluralOperand(PluralOperand operand) const U_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.h b/icu4c/source/i18n/number_longnames.h
index 67695d003939db2fbcdf29c136c31caab5a5894b..99d432630255e467358ff19615053afa8820dbc8 100644 (file)
--- a/icu4c/source/i18n/number_longnames.h
+++ b/icu4c/source/i18n/number_longnames.h
@@ -23,7 +23,7 @@ class LongNameHandler : public MicroPropsGenerator, public UObject {
                    const PluralRules *rules, const MicroPropsGenerator *parent, UErrorCode &status);
 
     void
-    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const override;
+    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const U_OVERRIDE;
 
   private:
     SimpleModifier fModifiers[StandardPlural::Form::COUNT];

diff --git a/icu4c/source/i18n/number_modifiers.h b/icu4c/source/i18n/number_modifiers.h
index 9d2f1975b9fbc98b8e122961fa388f0e5940852a..949331e3caa02984a80ac32d019c98e4fd5f9a2e 100644 (file)
--- a/icu4c/source/i18n/number_modifiers.h
+++ b/icu4c/source/i18n/number_modifiers.h
@@ -27,13 +27,13 @@ class U_I18N_API ConstantAffixModifier : public Modifier, public UObject {
             : fPrefix(prefix), fSuffix(suffix), fField(field), fStrong(strong) {}
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getPrefixLength(UErrorCode &status) const override;
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getCodePointCount(UErrorCode &status) const override;
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE;
 
-    bool isStrong() const override;
+    bool isStrong() const U_OVERRIDE;
 
   private:
     UnicodeString fPrefix;
@@ -54,13 +54,13 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory {
     SimpleModifier();
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getPrefixLength(UErrorCode &status) const override;
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getCodePointCount(UErrorCode &status) const override;
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE;
 
-    bool isStrong() const override;
+    bool isStrong() const U_OVERRIDE;
 
     /**
      * TODO: This belongs in SimpleFormatterImpl. The only reason I haven't moved it there yet is because
@@ -105,13 +105,13 @@ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory {
                                bool strong) : fPrefix(prefix), fSuffix(suffix), fStrong(strong) {}
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getPrefixLength(UErrorCode &status) const override;
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getCodePointCount(UErrorCode &status) const override;
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE;
 
-    bool isStrong() const override;
+    bool isStrong() const U_OVERRIDE;
 
   protected:
     // NOTE: In Java, these are stored as array pointers. In C++, the NumberStringBuilder is stored by
@@ -129,7 +129,7 @@ class U_I18N_API CurrencySpacingEnabledModifier : public ConstantMultiFieldModif
                                    bool strong, const DecimalFormatSymbols &symbols, UErrorCode &status);
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
     /** Unsafe code path */
     static int32_t
@@ -169,7 +169,7 @@ class U_I18N_API EmptyModifier : public Modifier, public UMemory {
     explicit EmptyModifier(bool isStrong) : fStrong(isStrong) {}
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override {
+                  UErrorCode &status) const U_OVERRIDE {
         (void)output;
         (void)leftIndex;
         (void)rightIndex;
@@ -177,17 +177,17 @@ class U_I18N_API EmptyModifier : public Modifier, public UMemory {
         return 0;
     }
 
-    int32_t getPrefixLength(UErrorCode &status) const override {
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE {
         (void)status;
         return 0;
     }
 
-    int32_t getCodePointCount(UErrorCode &status) const override {
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE {
         (void)status;
         return 0;
     }
 
-    bool isStrong() const override {
+    bool isStrong() const U_OVERRIDE {
         return fStrong;
     }
 

diff --git a/icu4c/source/i18n/number_patternmodifier.h b/icu4c/source/i18n/number_patternmodifier.h
index 52e57c292597bceeaec0986083415d8acb038c3d..8d38e2ef4cb434eec05dcdedeffc6bc4ee91d2bc 100644 (file)
--- a/icu4c/source/i18n/number_patternmodifier.h
+++ b/icu4c/source/i18n/number_patternmodifier.h
@@ -22,9 +22,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:
-       ~ImmutablePatternModifier() override = default;
+       ~ImmutablePatternModifier() U_OVERRIDE = default;
 
-    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const override;
+    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const U_OVERRIDE;
 
     void applyToMicros(MicroProps &micros, DecimalQuantity &quantity) const;
 
@@ -62,7 +62,7 @@ class U_I18N_API MutablePatternModifier
         : public MicroPropsGenerator, public Modifier, public SymbolProvider, public CharSequence {
   public:
 
-    ~MutablePatternModifier() override = default;
+    ~MutablePatternModifier() U_OVERRIDE = default;
 
     /**
      * @param isStrong
@@ -155,29 +155,29 @@ class U_I18N_API MutablePatternModifier
 
     MicroPropsGenerator &addToChain(const MicroPropsGenerator *parent);
 
-    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const override;
+    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const U_OVERRIDE;
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getPrefixLength(UErrorCode &status) const override;
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getCodePointCount(UErrorCode &status) const override;
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE;
 
-    bool isStrong() const override;
+    bool isStrong() const U_OVERRIDE;
 
     /**
      * Returns the string that substitutes a given symbol type in a pattern.
      */
-    UnicodeString getSymbol(AffixPatternType type) const override;
+    UnicodeString getSymbol(AffixPatternType type) const U_OVERRIDE;
 
-    int32_t length() const override;
+    int32_t length() const U_OVERRIDE;
 
-    char16_t charAt(int32_t index) const override;
+    char16_t charAt(int32_t index) const U_OVERRIDE;
 
     // Use default implementation of codePointAt
 
-    UnicodeString toUnicodeString() const override;
+    UnicodeString toUnicodeString() const U_OVERRIDE;
 
   private:
     // Modifier details

diff --git a/icu4c/source/i18n/number_patternstring.h b/icu4c/source/i18n/number_patternstring.h
index d48b1bd648115927d52ef045c7f102535f33848f..50570c5d892069c795b88a65de3d8320ed16f088 100644 (file)
--- a/icu4c/source/i18n/number_patternstring.h
+++ b/icu4c/source/i18n/number_patternstring.h
@@ -61,25 +61,25 @@ struct U_I18N_API ParsedPatternInfo : public AffixPatternProvider, public UMemor
 
     ParsedPatternInfo() : state(this->pattern), currentSubpattern(nullptr) {}
 
-    ~ParsedPatternInfo() override = default;
+    ~ParsedPatternInfo() U_OVERRIDE = default;
 
     static int32_t getLengthFromEndpoints(const Endpoints &endpoints);
 
-    char16_t charAt(int32_t flags, int32_t index) const override;
+    char16_t charAt(int32_t flags, int32_t index) const U_OVERRIDE;
 
-    int32_t length(int32_t flags) const override;
+    int32_t length(int32_t flags) const U_OVERRIDE;
 
     UnicodeString getString(int32_t flags) const;
 
-    bool positiveHasPlusSign() const override;
+    bool positiveHasPlusSign() const U_OVERRIDE;
 
-    bool hasNegativeSubpattern() const override;
+    bool hasNegativeSubpattern() const U_OVERRIDE;
 
-    bool negativeHasMinusSign() const override;
+    bool negativeHasMinusSign() const U_OVERRIDE;
 
-    bool hasCurrencySign() const override;
+    bool hasCurrencySign() const U_OVERRIDE;
 
-    bool containsSymbolType(AffixPatternType type, UErrorCode &status) const override;
+    bool containsSymbolType(AffixPatternType type, UErrorCode &status) const U_OVERRIDE;
 
   private:
     struct ParserState {

diff --git a/icu4c/source/i18n/number_scientific.h b/icu4c/source/i18n/number_scientific.h
index 8ba60e9414640e42c4737dab2a15e03fb242b250..bce14b00ca064820e1b6225e0cc549147bbc37d7 100644 (file)
--- a/icu4c/source/i18n/number_scientific.h
+++ b/icu4c/source/i18n/number_scientific.h
@@ -20,13 +20,13 @@ class U_I18N_API ScientificModifier : public UMemory, public Modifier {
     void set(int32_t exponent, const ScientificHandler *handler);
 
     int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex,
-                  UErrorCode &status) const override;
+                  UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getPrefixLength(UErrorCode &status) const override;
+    int32_t getPrefixLength(UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getCodePointCount(UErrorCode &status) const override;
+    int32_t getCodePointCount(UErrorCode &status) const U_OVERRIDE;
 
-    bool isStrong() const override;
+    bool isStrong() const U_OVERRIDE;
 
   private:
     int32_t fExponent;
@@ -39,9 +39,9 @@ class ScientificHandler : public UMemory, public MicroPropsGenerator, public Mul
                       const MicroPropsGenerator *parent);
 
     void
-    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const override;
+    processQuantity(DecimalQuantity &quantity, MicroProps &micros, UErrorCode &status) const U_OVERRIDE;
 
-    int32_t getMultiplier(int32_t magnitude) const override;
+    int32_t getMultiplier(int32_t magnitude) const U_OVERRIDE;
 
   private:
     const Notation::ScientificSettings& fSettings;

diff --git a/icu4c/source/i18n/number_types.h b/icu4c/source/i18n/number_types.h
index b6ade0a4e2530dadf9a1a5bd57aafe72c4999c31..7a93d87e40e034ebe30e1ea6ca898e4142c634ae 100644 (file)
--- a/icu4c/source/i18n/number_types.h
+++ b/icu4c/source/i18n/number_types.h
@@ -12,6 +12,7 @@
 #include "unicode/numberformatter.h"
 #include "unicode/utf16.h"
 #include "uassert.h"
+#include "unicode/platform.h"
 
 U_NAMESPACE_BEGIN
 namespace number {

diff --git a/icu4c/source/i18n/number_utils.h b/icu4c/source/i18n/number_utils.h
index 90a8b8ec83210fc5b03b955d796d432c9adceb59..2494260a7eb934eda3a9e566f582c573ac1f6212 100644 (file)
--- a/icu4c/source/i18n/number_utils.h
+++ b/icu4c/source/i18n/number_utils.h
@@ -21,21 +21,21 @@ class UnicodeStringCharSequence : public CharSequence {
         fStr = other;
     }
 
-    ~UnicodeStringCharSequence() override = default;
+    ~UnicodeStringCharSequence() U_OVERRIDE = default;
 
-    int32_t length() const override {
+    int32_t length() const U_OVERRIDE {
         return fStr.length();
     }
 
-    char16_t charAt(int32_t index) const override {
+    char16_t charAt(int32_t index) const U_OVERRIDE {
         return fStr.charAt(index);
     }
 
-    UChar32 codePointAt(int32_t index) const override {
+    UChar32 codePointAt(int32_t index) const U_OVERRIDE {
         return fStr.char32At(index);
     }
 
-    UnicodeString toUnicodeString() const override {
+    UnicodeString toUnicodeString() const U_OVERRIDE {
         // Allocate a UnicodeString of the correct length
         UnicodeString output(length(), 0, -1);
         for (int32_t i = 0; i < length(); i++) {
@@ -80,7 +80,7 @@ struct MicroProps : public MicroPropsGenerator {
 
     MicroProps &operator=(const MicroProps &other) = default;
 
-    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const override {
+    void processQuantity(DecimalQuantity &, MicroProps &micros, UErrorCode &status) const U_OVERRIDE {
         (void)status;
         if (this == &micros) {
             // Unsafe path: no need to perform a copy.