Index: source/i18n/collationfastlatinbuilder.h |
diff --git a/source/i18n/collationfastlatinbuilder.h b/source/i18n/collationfastlatinbuilder.h |
index b0ac5fa99e9d60e6db7504f374bceb8820cb9506..631e0fb7f84a8365b1b821c004e47b0241bcc2c8 100644 |
--- a/source/i18n/collationfastlatinbuilder.h |
+++ b/source/i18n/collationfastlatinbuilder.h |
@@ -1,6 +1,6 @@ |
/* |
******************************************************************************* |
-* Copyright (C) 2013-2014, International Business Machines |
+* Copyright (C) 2013-2015, International Business Machines |
* Corporation and others. All Rights Reserved. |
******************************************************************************* |
* collationfastlatinbuilder.h |
@@ -39,6 +39,9 @@ public: |
int32_t lengthOfTable() const { return result.length(); } |
private: |
+ // space, punct, symbol, currency (not digit) |
+ enum { NUM_SPECIAL_GROUPS = UCOL_REORDER_CODE_CURRENCY - UCOL_REORDER_CODE_FIRST + 1 }; |
+ |
UBool loadGroups(const CollationData &data, UErrorCode &errorCode); |
UBool inSameGroup(uint32_t p, uint32_t q) const; |
@@ -73,7 +76,8 @@ private: |
/** One 16-bit mini CE per unique CE. */ |
uint16_t *miniCEs; |
- // These are constant for a given list of CollationData.scripts. |
+ // These are constant for a given root collator. |
+ uint32_t lastSpecialPrimaries[NUM_SPECIAL_GROUPS]; |
uint32_t firstDigitPrimary; |
uint32_t firstLatinPrimary; |
uint32_t lastLatinPrimary; |