From 88102d442d775a4a4c18f77cca6ee8797809283c Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 15 Jan 2004 22:27:39 +0000 Subject: [PATCH] ICU-3236 Use proper name scoping of internal functions. X-SVN-Rev: 14336 --- icu4c/source/common/icuserv.cpp | 2 +- icu4c/source/common/icuserv.h | 2 +- icu4c/source/test/intltest/icusvtst.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/icu4c/source/common/icuserv.cpp b/icu4c/source/common/icuserv.cpp index 624b6be69e..41dc9afe70 100644 --- a/icu4c/source/common/icuserv.cpp +++ b/icu4c/source/common/icuserv.cpp @@ -319,7 +319,7 @@ StringPair::StringPair(const UnicodeString& _displayName, } U_CAPI void U_EXPORT2 -deleteStringPair(void *obj) { +userv_deleteStringPair(void *obj) { U_NAMESPACE_USE delete (StringPair*) obj; } diff --git a/icu4c/source/common/icuserv.h b/icu4c/source/common/icuserv.h index 24cac2afdd..42ac2b238a 100644 --- a/icu4c/source/common/icuserv.h +++ b/icu4c/source/common/icuserv.h @@ -433,7 +433,7 @@ private: * Deleter for StringPairs */ U_CAPI void U_EXPORT2 -deleteStringPair(void *obj); +userv_deleteStringPair(void *obj); /** * Opaque type returned by registerInstance and registerFactory. diff --git a/icu4c/source/test/intltest/icusvtst.cpp b/icu4c/source/test/intltest/icusvtst.cpp index 3166b5464e..f5c87b7055 100644 --- a/icu4c/source/test/intltest/icusvtst.cpp +++ b/icu4c/source/test/intltest/icusvtst.cpp @@ -667,7 +667,7 @@ ICUServiceTest::testAPI_Two() // iterate over the display names { UErrorCode status = U_ZERO_ERROR; - UVector names(deleteStringPair, NULL, status); + UVector names(userv_deleteStringPair, NULL, status); service.getDisplayNames(names, Locale::getGerman(), status); for (int i = 0; i < names.size(); ++i) { const StringPair* pair = (const StringPair*)names[i]; @@ -707,7 +707,7 @@ ICUServiceTest::testAPI_Two() // Rad dude's surfer gal 'replaces' Later's surfer gal { UErrorCode status = U_ZERO_ERROR; - UVector names(deleteStringPair, NULL, status); + UVector names(userv_deleteStringPair, NULL, status); service.getDisplayNames(names, Locale("es"), status); for (int i = 0; i < names.size(); ++i) { const StringPair* pair = (const StringPair*)names[i]; @@ -878,7 +878,7 @@ ICUServiceTest::testRBF() // this should be fast since the display names were cached. { UErrorCode status = U_ZERO_ERROR; - UVector names(deleteStringPair, NULL, status); + UVector names(userv_deleteStringPair, NULL, status); service.getDisplayNames(names, Locale::getGermany(), status); logln("service display names for de_DE"); for (int i = 0; i < names.size(); ++i) { @@ -904,7 +904,7 @@ ICUServiceTest::testRBF() logln(UnicodeString("\n --- ") + idNames[i] + " ---"); { UErrorCode status = U_ZERO_ERROR; - UVector names(deleteStringPair, NULL, status); + UVector names(userv_deleteStringPair, NULL, status); service.getDisplayNames(names, idNames[i], status); for (int i = 0; i < names.size(); ++i) { const StringPair* pair = (const StringPair*)names[i];