From: Shane Carr Date: Fri, 6 Oct 2017 09:02:10 +0000 (+0000) Subject: ICU-13177 Moving FixedDecimal and IFixedDecimal destructors to cpp file. X-Git-Tag: release-60-rc~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a43ed9826b78f422f60e0e910f486a5cc03fb86;p=icu ICU-13177 Moving FixedDecimal and IFixedDecimal destructors to cpp file. X-SVN-Rev: 40591 --- diff --git a/icu4c/source/i18n/plurrule.cpp b/icu4c/source/i18n/plurrule.cpp index 950243e42e2..42e1f64e14d 100644 --- a/icu4c/source/i18n/plurrule.cpp +++ b/icu4c/source/i18n/plurrule.cpp @@ -1405,6 +1405,8 @@ PluralKeywordEnumeration::count(UErrorCode& /*status*/) const { PluralKeywordEnumeration::~PluralKeywordEnumeration() { } +IFixedDecimal::~IFixedDecimal() = default; + FixedDecimal::FixedDecimal(const VisibleDigits &digits) { digits.getFixedDecimal( source, intValue, decimalDigits, @@ -1481,6 +1483,8 @@ FixedDecimal::FixedDecimal(const FixedDecimal &other) { _isInfinite = other._isInfinite; } +FixedDecimal::~FixedDecimal() = default; + void FixedDecimal::init(double n) { int32_t numFractionDigits = decimals(n); diff --git a/icu4c/source/i18n/plurrule_impl.h b/icu4c/source/i18n/plurrule_impl.h index b93b40cbf83..e4f3f3f6eae 100644 --- a/icu4c/source/i18n/plurrule_impl.h +++ b/icu4c/source/i18n/plurrule_impl.h @@ -227,7 +227,7 @@ enum PluralOperand { */ class U_I18N_API IFixedDecimal { public: - virtual ~IFixedDecimal() = default; + virtual ~IFixedDecimal(); /** * Returns the value corresponding to the specified operand (n, i, f, t, v, or w). @@ -278,7 +278,7 @@ class U_I18N_API FixedDecimal: public IFixedDecimal, public UObject { explicit FixedDecimal(double n); explicit FixedDecimal(const VisibleDigits &n); FixedDecimal(); - ~FixedDecimal() U_OVERRIDE = default; + ~FixedDecimal() U_OVERRIDE; FixedDecimal(const UnicodeString &s, UErrorCode &ec); FixedDecimal(const FixedDecimal &other); diff --git a/icu4c/source/test/intltest/numbertest_affixutils.cpp b/icu4c/source/test/intltest/numbertest_affixutils.cpp index 5fff9853e6a..63c155ca496 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) {} - virtual UnicodeString getSymbol(AffixPatternType type) const { + virtual UnicodeString getSymbol(AffixPatternType type) const U_OVERRIDE { switch (type) { case TYPE_MINUS_SIGN: return u"−"; @@ -43,7 +43,7 @@ class DefaultSymbolProvider : public SymbolProvider { return u"\uFFFD"; default: U_ASSERT(false); - return 0; // silence compiler warnings + return {}; // silence compiler warnings } } };