summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp')
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp b/Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp
index 8493ecd0377..1bf742d148c 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp
+++ b/Build/source/libs/icu/icu-src/source/i18n/decimfmtimpl.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/*
* Copyright (C) 2015, International Business Machines
* Corporation and others. All Rights Reserved.
@@ -241,9 +243,9 @@ DecimalFormatImpl::setMultiplierScale(int32_t scale) {
if (scale == 0) {
// Needed to preserve equality. fMultiplier == 0 means
// multiplier is 1.
- fMultiplier.set(0);
+ fMultiplier.set((int32_t)0);
} else {
- fMultiplier.set(1);
+ fMultiplier.set((int32_t)1);
fMultiplier.shiftDecimalRight(scale);
}
}
@@ -425,7 +427,7 @@ DecimalFormatImpl::format(
UnicodeString &
DecimalFormatImpl::format(
- const StringPiece &number,
+ StringPiece number,
UnicodeString &appendTo,
FieldPositionIterator *posIter,
UErrorCode &status) const {
@@ -706,7 +708,7 @@ DecimalFormatImpl::getMultiplier() const {
void
DecimalFormatImpl::setMultiplier(int32_t m) {
if (m == 0 || m == 1) {
- fMultiplier.set(0);
+ fMultiplier.set((int32_t)0);
} else {
fMultiplier.set(m);
}
@@ -1481,7 +1483,7 @@ DecimalFormatImpl::toNumberPattern(
}
} else {
if (i < roundingIncrementUpperExp && i >= roundingIncrementLowerExp) {
- result.append(fEffPrecision.fMantissa.fRoundingIncrement.getDigitByExponent(i) + kPatternZeroDigit);
+ result.append((UChar)(fEffPrecision.fMantissa.fRoundingIncrement.getDigitByExponent(i) + kPatternZeroDigit));
} else if (minInterval.contains(i)) {
result.append(kPatternZeroDigit);
} else {