organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-2135 Don't export these private static variable names.

Browse source 
It makes it difficult to find other cache locations.

X-SVN-Rev: 10676
This commit is contained in:
George Rhoten 2002-12-14 09:03:22 +00:00
parent 714e40a7bc
commit 96d7a9c8a7
2 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
icu4c/source/common/iculserv.cpp
View file

@ -17,6 +17,13 @@
U_NAMESPACE_BEGIN
static Hashtable * LocaleUtility_cache = NULL;
#define UNDERSCORE_CHAR ((UChar)0x005f)
static UMTX LocaleUtility_lock = 0;
/*
******************************************************************
*/
@ -87,7 +94,7 @@ LocaleUtility::getAvailableLocaleNames(const UnicodeString& bundleID)
// have to ignore bundleID for the moment, since we don't have easy C++ api.
// assume it's the default bundle
if (cache == NULL) {
if (LocaleUtility_cache == NULL) {
Hashtable* result = new Hashtable();
if (result) {
UErrorCode status = U_ZERO_ERROR;
@ -101,16 +108,16 @@ LocaleUtility::getAvailableLocaleNames(const UnicodeString& bundleID)
}
}
{
Mutex mutex(&lock);
if (cache == NULL) {
cache = result;
return cache;
Mutex mutex(&LocaleUtility_lock);
if (LocaleUtility_cache == NULL) {
LocaleUtility_cache = result;
return LocaleUtility_cache;
}
}
delete result;
}
}
return cache;
return LocaleUtility_cache;
}
UBool
@ -123,27 +130,19 @@ LocaleUtility::isFallbackOf(const UnicodeString& root, const UnicodeString& chil
UBool
LocaleUtility::cleanup(void) {
if (cache) {
Mutex mutex(&lock);
delete cache;
cache = NULL;
}
umtx_destroy(&lock);
return TRUE;
if (LocaleUtility_cache) {
Mutex mutex(&LocaleUtility_lock);
delete LocaleUtility_cache;
LocaleUtility_cache = NULL;
}
umtx_destroy(&LocaleUtility_lock);
return TRUE;
}
Hashtable * LocaleUtility::cache = NULL;
const UChar LocaleUtility::UNDERSCORE_CHAR = 0x005f;
UMTX LocaleUtility::lock = 0;
/*
******************************************************************
*/
const UChar LocaleKey::UNDERSCORE_CHAR = 0x005f;
const int32_t LocaleKey::KIND_ANY = -1;
LocaleKey*

6
icu4c/source/common/iculserv.h
View file

@ -70,8 +70,6 @@ class U_COMMON_API LocaleKey : public ICUServiceKey {
UnicodeString _fallbackID;
UnicodeString _currentID;
static const UChar UNDERSCORE_CHAR; // '_'
public:
static const int32_t KIND_ANY; // = -1;
@ -540,10 +538,6 @@ class U_COMMON_API ICULocaleService : public ICUService
// in header so tests can also access them
class U_COMMON_API LocaleUtility {
static Hashtable* cache;
static UMTX lock;
static const UChar UNDERSCORE_CHAR;
public:
static UnicodeString& canonicalLocaleString(const UnicodeString* id, UnicodeString& result);
static Locale& initLocaleFromName(const UnicodeString& id, Locale& result);