AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-535 Fixed some compiler warnings.

Browse Source 
X-SVN-Rev: 3175
This commit is contained in:
George Rhoten 2000-12-08 20:14:00 +00:00
parent 8550451668
commit ccd29c31f6
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu4c/source/test/intltest/restest.cpp
View File

@ -42,11 +42,11 @@ enum E_Where
//***************************************************************************************
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of " << (expected) << endl; pass=FALSE; }
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x >= " << (expected) << endl; pass=FALSE; }
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x != " << (expected) << endl; pass=FALSE; }
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of " + (expected)); }
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x >= " + (expected)); }
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x != " + (expected)); }
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << u_errorName(actual) << " instead of " << u_errorName(expected) << endl; pass=FALSE; }
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + u_errorName(actual) + " instead of " + u_errorName(expected)); }
//***************************************************************************************
@ -339,7 +339,7 @@ ResourceBundleTest::testTag(const char* frag,
UBool in_te,
UBool in_te_IN)
{
UBool pass=TRUE;
int32_t passOrig = pass;
// Make array from input params
@ -621,7 +621,7 @@ ResourceBundleTest::testTag(const char* frag,
if (tags[index].startsWith("tag") && items[index].startsWith(base))
record_pass();
else
record_fail();
record_fail("tag = " + tags[index] + ", value = " + items[index]);
}
}
else
@ -666,7 +666,7 @@ ResourceBundleTest::testTag(const char* frag,
}
CONFIRM_EQ(count, expected_count);
}
return pass;
return (UBool)(passOrig == pass);
}
void
@ -675,9 +675,9 @@ ResourceBundleTest::record_pass()
++pass;
}
void
ResourceBundleTest::record_fail()
ResourceBundleTest::record_fail(const UnicodeString &message)
{
err();
err(message);
++fail;
}
//eof

2
icu4c/source/test/intltest/restest.h
View File

@ -38,7 +38,7 @@ private:
UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
void record_pass(void);
void record_fail(void);
void record_fail(const UnicodeString &message);
int32_t pass;
int32_t fail;

18
icu4c/source/test/intltest/restsnew.cpp
View File

@ -42,11 +42,11 @@ enum E_Where
//***************************************************************************************
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of " << (expected) << endl; pass=FALSE; }
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x >= " << (expected) << endl; pass=FALSE; }
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x != " << (expected) << endl; pass=FALSE; }
#define CONFIRM_EQ(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of " + (expected)); }
#define CONFIRM_GE(actual,expected) if ((actual)>=(expected)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x >= " + (expected)); }
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(action + " returned " + (actual) + " instead of x != " + (expected)); }
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << u_errorName(actual) << " instead of " << u_errorName(expected) << endl; pass=FALSE; }
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(action + " returned " + u_errorName(actual) + " instead of " + u_errorName(expected)); }
//***************************************************************************************
@ -495,7 +495,7 @@ NewResourceBundleTest::testTag(const char* frag,
UBool in_te,
UBool in_te_IN)
{
UBool pass=TRUE;
int32_t passOrig = pass;
// Make array from input params
@ -786,7 +786,7 @@ NewResourceBundleTest::testTag(const char* frag,
if(key.startsWith("tag") && value.startsWith(base)){
record_pass();
}else{
record_fail();
record_fail("tag = " + key + ", value = " + value);
}
}
@ -844,7 +844,7 @@ NewResourceBundleTest::testTag(const char* frag,
CONFIRM_EQ(count, tag_count);
}
return pass;
return (UBool)(passOrig == pass);
}
void
@ -853,9 +853,9 @@ NewResourceBundleTest::record_pass()
++pass;
}
void
NewResourceBundleTest::record_fail()
NewResourceBundleTest::record_fail(const UnicodeString &message)
{
err();
err(message);
++fail;
}
//eof

2
icu4c/source/test/intltest/restsnew.h
View File

@ -42,7 +42,7 @@ private:
UBool testTag(const char* frag, UBool in_Root, UBool in_te, UBool in_te_IN);
void record_pass(void);
void record_fail(void);
void record_fail(const UnicodeString &message);
int32_t pass;
int32_t fail;