organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10379 fixes for IBM i - ambiguous types

Browse source 
X-SVN-Rev: 34285
This commit is contained in:
Steven R. Loomis 2013-09-12 06:29:39 +00:00
parent b258b9a07b
commit bbc0a17a8e
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/i18n/decimfmt.cpp
View file

@ -1551,7 +1551,7 @@ DecimalFormat::_round(const DigitList &number, DigitList &adjustedNum, UBool& is
if (fScale != 0) {
DigitList ten;
ten.set(10);
ten.set((int32_t)10);
if (fScale > 0) {
for (int32_t i = fScale ; i > 0 ; i--) {
adjustedNum.mult(ten, status);
@ -2196,7 +2196,7 @@ void DecimalFormat::parse(const UnicodeString& text,
if (fScale != 0) {
DigitList ten;
ten.set(10);
ten.set((int32_t)10);
if (fScale > 0) {
for (int32_t i = fScale; i > 0; i--) {
UErrorCode ec = U_ZERO_ERROR;

6
icu4c/source/test/intltest/plurfmts.cpp
View file

@ -670,14 +670,14 @@ PluralFormatTest::TestDecimals() {
IcuTestErrorCode errorCode(*this, "TestDecimals");
// Simple number replacement.
PluralFormat pf(Locale::getEnglish(), "one{one meter}other{# meters}", errorCode);
assertEquals("simple format(1)", "one meter", pf.format(1, errorCode));
assertEquals("simple format(1)", "one meter", pf.format((int32_t)1, errorCode));
assertEquals("simple format(1.5)", "1.5 meters", pf.format(1.5, errorCode));
PluralFormat pf2(Locale::getEnglish(),
"offset:1 one{another meter}other{another # meters}", errorCode);
DecimalFormat df("0.0", new DecimalFormatSymbols(Locale::getEnglish(), errorCode), errorCode);
pf2.setNumberFormat(&df, errorCode);
assertEquals("offset-decimals format(1)", "another 0.0 meters", pf2.format(1, errorCode));
assertEquals("offset-decimals format(2)", "another 1.0 meters", pf2.format(2, errorCode));
assertEquals("offset-decimals format(1)", "another 0.0 meters", pf2.format((int32_t)1, errorCode));
assertEquals("offset-decimals format(2)", "another 1.0 meters", pf2.format((int32_t)2, errorCode));
assertEquals("offset-decimals format(2.5)", "another 1.5 meters", pf2.format(2.5, errorCode));
}

18
icu4c/source/test/intltest/tmsgfmt.cpp
View file

@ -1905,7 +1905,7 @@ void TestMessageFormat::TestDecimals() {
assertEquals("simple format(1)", "one meter",
m.format(args, 1, result, ignore, errorCode));
args[0] = 1.5;
args[0] = (double)1.5;
result.remove();
assertEquals("simple format(1.5)", "1.5 meters",
m.format(args, 1, result, ignore, errorCode));
@ -1914,12 +1914,12 @@ void TestMessageFormat::TestDecimals() {
MessageFormat m0(
"{0,plural,one{one meter}other{{0} meters}}",
Locale::getEnglish(), errorCode);
args[0] = 1;
args[0] = (int32_t)1;
result.remove();
assertEquals("explicit format(1)", "one meter",
m0.format(args, 1, result, ignore, errorCode));
args[0] = 1.5;
args[0] = (double)1.5;
result.remove();
assertEquals("explicit format(1.5)", "1.5 meters",
m0.format(args, 1, result, ignore, errorCode));
@ -1928,17 +1928,17 @@ void TestMessageFormat::TestDecimals() {
MessageFormat m1(
"{0,plural,offset:1 one{another meter}other{{0,number,00.#} meters}}",
Locale::getEnglish(), errorCode);
args[0] = 1;
args[0] = (int32_t)1;
result.remove();
assertEquals("offset format(1)", "01 meters",
m1.format(args, 1, result, ignore, errorCode));
args[0] = 2;
args[0] = (int32_t)2;
result.remove();
assertEquals("offset format(1)", "another meter",
m1.format(args, 1, result, ignore, errorCode));
args[0] = 2.5;
args[0] = (double)2.5;
result.remove();
assertEquals("offset format(1)", "02.5 meters",
m1.format(args, 1, result, ignore, errorCode));
@ -1947,17 +1947,17 @@ void TestMessageFormat::TestDecimals() {
MessageFormat m2(
"{0,plural,offset:1 one{another meter}other{{0,number,0.0} meters}}",
Locale::getEnglish(), errorCode);
args[0] = 1;
args[0] = (int32_t)1;
result.remove();
assertEquals("offset-decimals format(1)", "1.0 meters",
m2.format(args, 1, result, ignore, errorCode));
args[0] = 2;
args[0] = (int32_t)2;
result.remove();
assertEquals("offset-decimals format(1)", "2.0 meters",
m2.format(args, 1, result, ignore, errorCode));
args[0] = 2.5;
args[0] = (double)2.5;
result.remove();
assertEquals("offset-decimals format(1)", "2.5 meters",
m2.format(args, 1, result, ignore, errorCode));