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

ICU-9474 Undo the changeset to reduce the exported C++ static variables.

Browse source 
X-SVN-Rev: 32299
This commit is contained in:
George Rhoten 2012-08-30 03:19:37 +00:00
parent d9c4c4785b
commit 89c00402a8
5 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
icu4c/source/i18n/alphaindex.cpp
View file

@ -63,19 +63,8 @@ alphaIndex_deleteRecord(void *obj) {
}
typedef const UChar PinyinLookup[24][3];
static const Normalizer2 *nfkdNormalizer;
static UBool indexCharactersAreInitialized = FALSE;
static UnicodeSet *ALPHABETIC;
static UnicodeSet *HANGUL;
static UnicodeSet *ETHIOPIC;
static UnicodeSet *CORE_LATIN;
static UnicodeSet *IGNORE_SCRIPTS;
static UnicodeSet *TO_TRY;
static UnicodeSet *UNIHAN;
static const UnicodeString *EMPTY_STRING;
static const Normalizer2 *nfkdNormalizer;
//
// Append the contents of a UnicodeSet to a UVector of UnicodeStrings.
@ -616,6 +605,7 @@ void AlphabeticIndex::init(UErrorCode &status) {
}
static UBool indexCharactersAreInitialized = FALSE;
// Index Characters Clean up function. Delete statically allocated constant stuff.
U_CDECL_BEGIN
@ -647,6 +637,15 @@ void AlphabeticIndex::staticCleanup() {
}
UnicodeSet *AlphabeticIndex::ALPHABETIC;
UnicodeSet *AlphabeticIndex::HANGUL;
UnicodeSet *AlphabeticIndex::ETHIOPIC;
UnicodeSet *AlphabeticIndex::CORE_LATIN;
UnicodeSet *AlphabeticIndex::IGNORE_SCRIPTS;
UnicodeSet *AlphabeticIndex::TO_TRY;
UnicodeSet *AlphabeticIndex::UNIHAN;
const UnicodeString *AlphabeticIndex::EMPTY_STRING;
//
// staticInit() One-time initialization of constants.
// Thread safe. Called from constructors.
@ -952,7 +951,7 @@ static const UChar PINYIN_LOWER_BOUNDS_SHORT[] = { // "\u0101bcd\u0113fghjk
// Pinyin lookup tables copied, pasted (and reformatted) from the ICU4J code.
static const PinyinLookup HACK_PINYIN_LOOKUP_SHORT = {
AlphabeticIndex::PinyinLookup AlphabeticIndex::HACK_PINYIN_LOOKUP_SHORT = {
{(UChar)0, (UChar)0, (UChar)0}, // A
{(UChar)0x516B, (UChar)0, (UChar)0}, // B
{(UChar)0x5693, (UChar)0, (UChar)0}, // C
@ -983,7 +982,7 @@ static const UChar PINYIN_LOWER_BOUNDS_LONG[] = { // "\u0101bcd\u0113fghjkl\u1
0x0101, 0x62, 0x63, 0x64, 0x0113, 0x66, 0x67, 0x68, 0x6A, 0x6B, /*l*/0x6C, 0x1E3F, 0x0144, 0x014D,
/*p*/0x70, 0x71, 0x72, 0x73, 0x74, /*w*/0x77, 0x78, 0x79, 0x7A};
static const PinyinLookup HACK_PINYIN_LOOKUP_LONG = {
AlphabeticIndex::PinyinLookup AlphabeticIndex::HACK_PINYIN_LOOKUP_LONG = {
{(UChar)0, (UChar)0, (UChar)0}, // A
{(UChar)0x516B, (UChar)0, (UChar)0}, // b
{(UChar)0xD863, (UChar)0xDEAD, (UChar)0}, // c
@ -1023,8 +1022,8 @@ static const PinyinLookup HACK_PINYIN_LOOKUP_LONG = {
//
// This whole arrangement is temporary.
//
static const PinyinLookup *HACK_PINYIN_LOOKUP = NULL;
static const UChar *PINYIN_LOWER_BOUNDS = NULL;
AlphabeticIndex::PinyinLookup *AlphabeticIndex::HACK_PINYIN_LOOKUP = NULL;
const UChar *AlphabeticIndex::PINYIN_LOWER_BOUNDS = NULL;
void AlphabeticIndex::initPinyinBounds(const Collator *col, UErrorCode &status) {
{

2
icu4c/source/i18n/colldata.cpp
View file

@ -1038,7 +1038,7 @@ void CollData::close(CollData *collData)
cache->unref(collData);
}
static CollDataCache *collDataCache = NULL;
CollDataCache *CollData::collDataCache = NULL;
CollDataCache *CollData::getCollDataCache()
{

6
icu4c/source/i18n/ucol.cpp
View file

@ -4272,8 +4272,6 @@ ucol_mergeSortkeys(const uint8_t *src1, int32_t src1Length,
U_NAMESPACE_BEGIN
static uint8_t lastResortByte_ = 0;
class SortKeyByteSink : public ByteSink {
public:
static const uint32_t FILL_ORIGINAL_BUFFER = 1;
@ -4345,6 +4343,8 @@ private:
capacity_ = 0;
}
static uint8_t lastResortByte_; // last-resort return value from LastByte()
char *ownedBuffer_;
char *buffer_;
int32_t capacity_;
@ -4353,6 +4353,8 @@ private:
UBool grow_;
};
uint8_t SortKeyByteSink::lastResortByte_ = 0;
SortKeyByteSink::~SortKeyByteSink() {
uprv_free(ownedBuffer_);
}

22
icu4c/source/i18n/unicode/alphaindex.h
View file

@ -695,8 +695,30 @@ private:
ELangType langType_; // The language type, simplified Chinese, Traditional Chinese,
// or not Chinese (Normal). Part of the Pinyin support
typedef const UChar PinyinLookup[24][3];
static PinyinLookup HACK_PINYIN_LOOKUP_SHORT;
static PinyinLookup HACK_PINYIN_LOOKUP_LONG;
// These will be lazily set to the short or long tables based on which
// Chinese collation has been configured into the ICU library.
static PinyinLookup *HACK_PINYIN_LOOKUP;
static const UChar *PINYIN_LOWER_BOUNDS;
int32_t recordCounter_; // Counts Records created. For minting record serial numbers.
// Constants. Lazily initialized the first time an AlphabeticIndex object is created.
static UnicodeSet *ALPHABETIC;
static UnicodeSet *CORE_LATIN;
static UnicodeSet *ETHIOPIC;
static UnicodeSet *HANGUL;
static UnicodeSet *IGNORE_SCRIPTS;
static UnicodeSet *TO_TRY;
static UnicodeSet *UNIHAN;
static const UnicodeString *EMPTY_STRING;
};
U_NAMESPACE_END

2
icu4c/source/i18n/unicode/colldata.h
View file

@ -441,6 +441,8 @@ private:
char keyBuffer[KEY_BUFFER_SIZE];
char *key;
static CollDataCache *collDataCache;
uint32_t minHan;
uint32_t maxHan;