diff --git a/icu4c/source/i18n/number_decimfmtprops.h b/icu4c/source/i18n/number_decimfmtprops.h index 4a78ed1b9b8..f42f94ac42c 100644 --- a/icu4c/source/i18n/number_decimfmtprops.h +++ b/icu4c/source/i18n/number_decimfmtprops.h @@ -35,22 +35,22 @@ namespace impl { // for DLL-exporting an fully specified template instantiation. class U_I18N_API CurrencyPluralInfoWrapper { public: - LocalPointer fPtr; + LocalPointer fPtr; - CurrencyPluralInfoWrapper() = default; + CurrencyPluralInfoWrapper() = default; - CurrencyPluralInfoWrapper(const CurrencyPluralInfoWrapper& other) { - if (!other.fPtr.isNull()) { - fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr)); - } - } + CurrencyPluralInfoWrapper(const CurrencyPluralInfoWrapper& other) { + if (!other.fPtr.isNull()) { + fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr)); + } + } - CurrencyPluralInfoWrapper& operator=(const CurrencyPluralInfoWrapper& other) { - if (!other.fPtr.isNull()) { - fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr)); - } - return *this; - } + CurrencyPluralInfoWrapper& operator=(const CurrencyPluralInfoWrapper& other) { + if (!other.fPtr.isNull()) { + fPtr.adoptInstead(new CurrencyPluralInfo(*other.fPtr)); + } + return *this; + } }; /** Controls the set of rules for parsing a string from the old DecimalFormat API. */ @@ -93,7 +93,7 @@ struct U_I18N_API DecimalFormatProperties { public: NullableValue compactStyle; NullableValue currency; - CurrencyPluralInfoWrapper currencyPluralInfo; + CurrencyPluralInfoWrapper currencyPluralInfo; NullableValue currencyUsage; bool decimalPatternMatchRequired; bool decimalSeparatorAlwaysShown; diff --git a/icu4c/source/i18n/number_utils.cpp b/icu4c/source/i18n/number_utils.cpp index 4f519e1daa0..2a74dba5ab1 100644 --- a/icu4c/source/i18n/number_utils.cpp +++ b/icu4c/source/i18n/number_utils.cpp @@ -217,7 +217,7 @@ DecNum::setTo(const uint8_t* bcd, int32_t length, int32_t scale, bool isNegative fData.getAlias()->bits = static_cast(isNegative ? DECNEG : 0); uprv_decNumberSetBCD(fData, bcd, static_cast(length)); if (fContext.status != 0) { - // Some error occured while constructing the decNumber. + // Some error occurred while constructing the decNumber. status = U_INTERNAL_PROGRAM_ERROR; } }