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

ICU-3236 Use proper name scoping of internal functions.

Browse Source 
X-SVN-Rev: 14336
This commit is contained in:
George Rhoten 2004-01-15 22:27:39 +00:00
parent 3a8eb7085a
commit 88102d442d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/icuserv.cpp
View File

@ -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;
}

2
icu4c/source/common/icuserv.h
View File

@ -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.

8
icu4c/source/test/intltest/icusvtst.cpp
View File

@ -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];