organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-241 remove obsolete T_INT32()

Browse source 
X-SVN-Rev: 1704
This commit is contained in:
Markus Scherer 2000-06-29 18:42:34 +00:00
parent 4660da6313
commit b2375850b7
7 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/unicode/utypes.h
View file

@ -262,10 +262,6 @@ inline UBool U_FAILURE(UErrorCode code) { return (UBool)(code>U_ZERO_ERROR); }
U_CAPI const char * U_EXPORT2
u_errorName(UErrorCode code);
/* Casting function for int32_t (backward compatibility version, here until
T_INT32 is replaced) */
#define T_INT32(i) ((int32_t)i)
#define U_COPYRIGHT_STRING \
" Copyright (C) 2000, International Business Machines Corporation and others. All Rights Reserved. "

2
icu4c/source/i18n/ptnentry.cpp
View file

@ -178,7 +178,7 @@ void PatternEntry::addToBuffer(UnicodeString& toAddTo,
// Append a string to a pattern buffer, adding quotes if necessary
void PatternEntry::appendQuoted(const UnicodeString& chars, UnicodeString& toAddTo) {
UBool inQuote = FALSE;
UChar ch = chars[T_INT32(0)];
UChar ch = chars[0];
if (Unicode::isSpaceChar(ch)) {
inQuote = TRUE;
toAddTo += (UChar)0x0027/*'\''*/;

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

@ -1878,10 +1878,10 @@ RuleBasedCollator::build(const UnicodeString& pattern,
// check if french secondary needs to be turned on
if ((groupChars.length() > 1) &&
(groupChars[groupChars.length()-(T_INT32(1))] == 0x0040))
(groupChars[groupChars.length()-1] == 0x0040))
{
data->isFrenchSec = TRUE;
groupChars.remove(groupChars.length()-(T_INT32(1)));
groupChars.remove(groupChars.length()-1);
}
order = increment((Collator::ECollationStrength)entry->getStrength(), order);

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

@ -69,7 +69,7 @@ NumberFormatTest::TestPatterns(void)
errln((UnicodeString)"FAIL: Pattern " + pat[i] + " should transmute to " + newpat[i] +
"; " + newp + " seen instead");
UnicodeString s; (*(NumberFormat*)&fmt).format(T_INT32(0), s);
UnicodeString s; (*(NumberFormat*)&fmt).format((int32_t)0, s);
if (!(s == num[i]))
{
errln((UnicodeString)"FAIL: Pattern " + pat[i] + " should format zero as " + num[i] +
@ -257,7 +257,7 @@ NumberFormatTest::TestQuotes(void)
pat = new UnicodeString("a'fo''o'b#");
DecimalFormat *fmt = new DecimalFormat(*pat, *sym, status);
UnicodeString s;
((NumberFormat*)fmt)->format(T_INT32(123), s);
((NumberFormat*)fmt)->format((int32_t)123, s);
logln((UnicodeString)"Pattern \"" + *pat + "\"");
logln((UnicodeString)" Format 123 -> " + escape(s));
if (!(s=="afo'ob123"))
@ -269,7 +269,7 @@ NumberFormatTest::TestQuotes(void)
pat = new UnicodeString("a''b#");
fmt = new DecimalFormat(*pat, *sym, status);
((NumberFormat*)fmt)->format(T_INT32(123), s);
((NumberFormat*)fmt)->format((int32_t)123, s);
logln((UnicodeString)"Pattern \"" + *pat + "\"");
logln((UnicodeString)" Format 123 -> " + escape(s));
if (!(s=="a'b123"))

8
icu4c/source/test/intltest/tchcfmt.cpp
View file

@ -149,7 +149,7 @@ TestChoiceFormat::TestComplexExample( void )
pattform->setFormat( 2, *filenumform );
Formattable testArgs[] = {T_INT32(0), "Disk_A", T_INT32(0)};
Formattable testArgs[] = {(int32_t)0, "Disk_A", (int32_t)0};
UnicodeString str;
UnicodeString res1, res2;
pattform->toPattern( res1 );
@ -382,7 +382,7 @@ TestChoiceFormat::TestComplexExample( void )
it_out << "ChoiceFormat format:" << res1 << endl;
if (res1 != "third") it_errln("*** ChoiceFormat format (int32_t, ...) result!");
Formattable ft( T_INT32(3) );
Formattable ft( (int32_t)3 );
str = "";
fpos = 0;
status = U_ZERO_ERROR;
@ -396,7 +396,7 @@ TestChoiceFormat::TestComplexExample( void )
it_out << "ChoiceFormat format:" << res1 << endl;
if (res1 != "third") it_errln("*** ChoiceFormat format (Formattable, ...) result!");
Formattable fta[] = { T_INT32(3) };
Formattable fta[] = { (int32_t)3 };
str = "";
fpos = 0;
status = U_ZERO_ERROR;
@ -460,7 +460,7 @@ TestChoiceFormat::TestChoiceNextDouble()
ChoiceFormat *cf = new ChoiceFormat(limit, formats, 3);
FieldPosition status(0);
UnicodeString toAppendTo;
cf->format(T_INT32(1.0), toAppendTo, status);
cf->format((int32_t)1, toAppendTo, status);
if (toAppendTo != "0.0<=Arg<=1.0") {
it_errln("ChoiceFormat cmp in testBug1");
}

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

@ -209,7 +209,7 @@ void test_Formattable( void )
{
Formattable( 1.0, Formattable::kIsDate ),
2.0,
T_INT32(3),
(int32_t)3,
ucs,
ucs_ptr
};
@ -218,7 +218,7 @@ void test_Formattable( void )
UnicodeString temp;
if ((ft_arr[0].getType() == Formattable::kDate) && (ft_arr[0].getDate() == 1.0)
&& (ft_arr[1].getType() == Formattable::kDouble) && (ft_arr[1].getDouble() == 2.0)
&& (ft_arr[2].getType() == Formattable::kLong) && (ft_arr[2].getLong() == T_INT32(3))
&& (ft_arr[2].getType() == Formattable::kLong) && (ft_arr[2].getLong() == (int32_t)3)
&& (ft_arr[3].getType() == Formattable::kString) && (ft_arr[3].getString(temp) == ucs)
&& (ft_arr[4].getType() == Formattable::kString) && (ft_arr[4].getString(temp) == *ucs_ptr) ) {
it_out << "FT constr. for date, double, long, ustring, ustring* and array tested" << endl;
@ -245,14 +245,14 @@ void test_Formattable( void )
it_errln("*** FT getArray count");
}
const Formattable ftarr1[] = { Formattable( T_INT32(1) ), Formattable( T_INT32(2) ) };
const Formattable ftarr2[] = { Formattable( T_INT32(3) ), Formattable( T_INT32(4) ) };
const Formattable ftarr1[] = { Formattable( (int32_t)1 ), Formattable( (int32_t)2 ) };
const Formattable ftarr2[] = { Formattable( (int32_t)3 ), Formattable( (int32_t)4 ) };
const int32_t ftarr1_cnt = sizeof(ftarr1) / sizeof(Formattable);
const int32_t ftarr2_cnt = sizeof(ftarr2) / sizeof(Formattable);
ft_arr.setArray( ftarr1, ftarr1_cnt );
if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == T_INT32(1))) {
if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == (int32_t)1)) {
it_out << "FT setArray tested" << endl;
}else{
it_errln("*** FT setArray");
@ -262,16 +262,16 @@ void test_Formattable( void )
for (int32_t i = 0; i < ftarr2_cnt; i++ ) {
ft_dynarr[i] = ftarr2[i];
}
if ((ft_dynarr[0].getType() == Formattable::kLong) && (ft_dynarr[0].getLong() == T_INT32(3))
&& (ft_dynarr[1].getType() == Formattable::kLong) && (ft_dynarr[1].getLong() == T_INT32(4))) {
if ((ft_dynarr[0].getType() == Formattable::kLong) && (ft_dynarr[0].getLong() == (int32_t)3)
&& (ft_dynarr[1].getType() == Formattable::kLong) && (ft_dynarr[1].getLong() == (int32_t)4)) {
it_out << "FT operator= and array operations tested" << endl;
}else{
it_errln("*** FT operator= or array operations");
}
ft_arr.adoptArray( ft_dynarr, ftarr2_cnt );
if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == T_INT32(3))
&& (ft_arr[1].getType() == Formattable::kLong) && (ft_arr[1].getLong() == T_INT32(4))) {
if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == (int32_t)3)
&& (ft_arr[1].getType() == Formattable::kLong) && (ft_arr[1].getLong() == (int32_t)4)) {
it_out << "FT adoptArray tested" << endl;
}else{
it_errln("*** FT adoptArray or operator[]");

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

@ -26,7 +26,7 @@
Formattable TestMessageFormat::testArgs[] = {
Formattable(double(1)), Formattable(double(3456)),
Formattable("Disk"), Formattable(UDate(T_INT32(1000000000)), Formattable::kIsDate)
Formattable("Disk"), Formattable(UDate((int32_t)1000000000L), Formattable::kIsDate)
};
UnicodeString TestMessageFormat::testCases[] = {
@ -160,7 +160,7 @@ void TestMessageFormat::testBug1()
ChoiceFormat *cf = new ChoiceFormat(limit, formats, 3);
FieldPosition status(0);
UnicodeString toAppendTo;
cf->format(T_INT32(1.0), toAppendTo, status);
cf->format((int32_t)1, toAppendTo, status);
if (toAppendTo != "1.0<=Arg<2.0") {
it_errln("ChoiceFormat cmp in testBug1");
}
@ -346,7 +346,7 @@ void TestMessageFormat::testStaticFormat(char* parm)
UErrorCode err = U_ZERO_ERROR;
GregorianCalendar cal(err);
Formattable arguments[] = {
T_INT32(7),
(int32_t)7,
Formattable(UDate(8.71068e+011), Formattable::kIsDate),
"a disturbance in the Force"
};
@ -381,9 +381,9 @@ void TestMessageFormat::testSimpleFormat(char* parm)
UErrorCode err = U_ZERO_ERROR;
Formattable testArgs1[] = {T_INT32(0), "MyDisk"};
Formattable testArgs2[] = {T_INT32(1), "MyDisk"};
Formattable testArgs3[] = {T_INT32(12), "MyDisk"};
Formattable testArgs1[] = {(int32_t)0, "MyDisk"};
Formattable testArgs2[] = {(int32_t)1, "MyDisk"};
Formattable testArgs3[] = {(int32_t)12, "MyDisk"};
MessageFormat* form = new MessageFormat(
"The disk \"{1}\" contains {0} file(s).", err);
@ -428,7 +428,7 @@ void TestMessageFormat::testMsgFormatChoice(char* parm)
FieldPosition ignore(FieldPosition::DONT_CARE);
UnicodeString string;
Formattable testArgs1[] = {T_INT32(0), "MyDisk"};
Formattable testArgs1[] = {(int32_t)0, "MyDisk"};
form->format(testArgs1, 2, string, ignore, err);
if (string != "The disk \"MyDisk\" contains no files.") {
errln("TestMessageFormat::testMsgFormatChoice failed on test #1");
@ -436,7 +436,7 @@ void TestMessageFormat::testMsgFormatChoice(char* parm)
ignore.setField(FieldPosition::DONT_CARE);
string.remove();
Formattable testArgs2[] = {T_INT32(1), "MyDisk"};
Formattable testArgs2[] = {(int32_t)1, "MyDisk"};
form->format(testArgs2, 2, string, ignore, err);
if (string != "The disk \"MyDisk\" contains one file.") {
errln("TestMessageFormat::testMsgFormatChoice failed on test #2");
@ -444,7 +444,7 @@ void TestMessageFormat::testMsgFormatChoice(char* parm)
ignore.setField(FieldPosition::DONT_CARE);
string.remove();
Formattable testArgs3[] = {T_INT32(1273), "MyDisk"};
Formattable testArgs3[] = {(int32_t)1273, "MyDisk"};
form->format(testArgs3, 2, string, ignore, err);
if (string != "The disk \"MyDisk\" contains 1,273 files.") {
errln("TestMessageFormat::testMsgFormatChoice failed on test #3");