From bd5472281ff27a229888518fd8f9f976736f3ba3 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Fri, 24 Oct 2003 01:04:44 +0000 Subject: [PATCH] ICU-3221 Fix some AIX linker warnings. X-SVN-Rev: 13482 --- icu4c/source/test/intltest/convtest.cpp | 4 +++- icu4c/source/test/intltest/convtest.h | 2 +- icu4c/source/test/intltest/g7coll.cpp | 1 + icu4c/source/test/intltest/g7coll.h | 2 +- icu4c/source/test/intltest/strcase.cpp | 2 ++ icu4c/source/test/intltest/strtest.cpp | 1 + icu4c/source/test/intltest/strtest.h | 2 +- icu4c/source/test/intltest/ustrtest.cpp | 12 +++++++----- icu4c/source/test/intltest/ustrtest.h | 4 ++-- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/icu4c/source/test/intltest/convtest.cpp b/icu4c/source/test/intltest/convtest.cpp index 5b208cf133c..b724c76c4aa 100644 --- a/icu4c/source/test/intltest/convtest.cpp +++ b/icu4c/source/test/intltest/convtest.cpp @@ -36,9 +36,11 @@ enum { ESC_CB='&' }; +ConversionTest::~ConversionTest() {} + void ConversionTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) { - if (exec) logln("TestSuite StringCaseTest: "); + if (exec) logln("TestSuite ConversionTest: "); switch (index) { case 0: name="TestToUnicode"; if (exec) TestToUnicode(); break; case 1: name="TestFromUnicode"; if (exec) TestFromUnicode(); break; diff --git a/icu4c/source/test/intltest/convtest.h b/icu4c/source/test/intltest/convtest.h index 14d63f157b1..eb55da0f658 100644 --- a/icu4c/source/test/intltest/convtest.h +++ b/icu4c/source/test/intltest/convtest.h @@ -52,7 +52,7 @@ struct ConversionCase { class ConversionTest : public IntlTest { public: ConversionTest() {} - virtual ~ConversionTest() {} + virtual ~ConversionTest(); void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0); diff --git a/icu4c/source/test/intltest/g7coll.cpp b/icu4c/source/test/intltest/g7coll.cpp index ee33ad1fa78..1cfa385417e 100644 --- a/icu4c/source/test/intltest/g7coll.cpp +++ b/icu4c/source/test/intltest/g7coll.cpp @@ -75,6 +75,7 @@ const int32_t G7CollationTest::results[G7CollationTest::TESTLOCALES][G7Collation { 19, 22, 21, 24, 23, 25, 12, 13, 9, 0, 17, 16, 28, 26, 27, 15, 18, 14, 1, 11, 2, 3, 4, 5, 20, 6, 8, 10, 7, 29 } }; +G7CollationTest::~G7CollationTest() {} void G7CollationTest::TestG7Locales(/* char* par */) { diff --git a/icu4c/source/test/intltest/g7coll.h b/icu4c/source/test/intltest/g7coll.h index bc511b19c62..2ff3c63814d 100644 --- a/icu4c/source/test/intltest/g7coll.h +++ b/icu4c/source/test/intltest/g7coll.h @@ -49,7 +49,7 @@ public: enum ETotal_Test { TOTALTESTSET = 30 }; G7CollationTest() {} - virtual ~G7CollationTest() {} + virtual ~G7CollationTest(); void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL ); diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp index b7c3d6f4dac..8e372601011 100644 --- a/icu4c/source/test/intltest/strcase.cpp +++ b/icu4c/source/test/intltest/strcase.cpp @@ -26,6 +26,8 @@ #include "ustrtest.h" #include "tstdtmod.h" +StringCaseTest::~StringCaseTest() {} + void StringCaseTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) { if (exec) logln("TestSuite StringCaseTest: "); diff --git a/icu4c/source/test/intltest/strtest.cpp b/icu4c/source/test/intltest/strtest.cpp index 39d43a56639..ca2d76c2552 100644 --- a/icu4c/source/test/intltest/strtest.cpp +++ b/icu4c/source/test/intltest/strtest.cpp @@ -23,6 +23,7 @@ using namespace std; #endif +StringTest::~StringTest() {} void StringTest::TestEndian(void) { union { diff --git a/icu4c/source/test/intltest/strtest.h b/icu4c/source/test/intltest/strtest.h index dc0cd0fd2d7..4799a28b8e5 100644 --- a/icu4c/source/test/intltest/strtest.h +++ b/icu4c/source/test/intltest/strtest.h @@ -25,7 +25,7 @@ class StringTest : public IntlTest { public: StringTest() {} - virtual ~StringTest() {} + virtual ~StringTest(); void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=NULL); diff --git a/icu4c/source/test/intltest/ustrtest.cpp b/icu4c/source/test/intltest/ustrtest.cpp index 74c6a0e7f81..3e30bc21530 100644 --- a/icu4c/source/test/intltest/ustrtest.cpp +++ b/icu4c/source/test/intltest/ustrtest.cpp @@ -26,15 +26,13 @@ using namespace std; #define LENGTHOF(array) (sizeof(array)/sizeof((array)[0])) +UnicodeStringTest::~UnicodeStringTest() {} + void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char *par) { if (exec) logln("TestSuite UnicodeStringTest: "); switch (index) { - case 0: name = "TestBasicManipulation"; if (exec) TestBasicManipulation(); break; - case 1: name = "TestCompare"; if (exec) TestCompare(); break; - case 2: name = "TestExtract"; if (exec) TestExtract(); break; - case 3: name = "TestRemoveReplace"; if (exec) TestRemoveReplace(); break; - case 4: + case 0: name = "StringCaseTest"; if (exec) { logln("StringCaseTest---"); logln(""); @@ -42,6 +40,10 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* & callTest(test, par); } break; + case 1: name = "TestBasicManipulation"; if (exec) TestBasicManipulation(); break; + case 2: name = "TestCompare"; if (exec) TestCompare(); break; + case 3: name = "TestExtract"; if (exec) TestExtract(); break; + case 4: name = "TestRemoveReplace"; if (exec) TestRemoveReplace(); break; case 5: name = "TestSearching"; if (exec) TestSearching(); break; case 6: name = "TestSpacePadding"; if (exec) TestSpacePadding(); break; case 7: name = "TestPrefixAndSuffix"; if (exec) TestPrefixAndSuffix(); break; diff --git a/icu4c/source/test/intltest/ustrtest.h b/icu4c/source/test/intltest/ustrtest.h index 573d9c1b9b0..e35ca453893 100644 --- a/icu4c/source/test/intltest/ustrtest.h +++ b/icu4c/source/test/intltest/ustrtest.h @@ -15,7 +15,7 @@ class UnicodeStringTest: public IntlTest { public: UnicodeStringTest() {} - virtual ~UnicodeStringTest() {} + virtual ~UnicodeStringTest(); void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL ); @@ -76,7 +76,7 @@ public: class StringCaseTest: public IntlTest { public: StringCaseTest() {} - virtual ~StringCaseTest() {} + virtual ~StringCaseTest(); void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=0);