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

ICU-12740 use private static const int32_t, not #define, for UDATPG_WIDTH_COUNT

Browse Source 
X-SVN-Rev: 41035
This commit is contained in:
Peter Edberg 2018-03-01 07:21:19 +00:00
parent ec9ee07ba5
commit b69d78b0e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/i18n/dtptngen.cpp
View File

@ -267,7 +267,7 @@ static const char* const CLDR_FIELD_NAME[UDATPG_FIELD_COUNT] = {
"hour", "minute", "second", "*", "zone"
};
static const char* const CLDR_FIELD_WIDTH[UDATPG_WIDTH_COUNT] = {
static const char* const CLDR_FIELD_WIDTH[] = { // [UDATPG_WIDTH_COUNT]
"", "-short", "-narrow"
};

3
icu4c/source/i18n/unicode/dtptngen.h
View File

@ -522,13 +522,14 @@ private:
*/
DateTimePatternGenerator& operator=(const DateTimePatternGenerator& other);
static const int32_t UDATPG_WIDTH_COUNT = UDATPG_NARROW + 1;
Locale pLocale; // pattern locale
FormatParser *fp;
DateTimeMatcher* dtMatcher;
DistanceInfo *distanceInfo;
PatternMap *patternMap;
UnicodeString appendItemFormats[UDATPG_FIELD_COUNT];
#define UDATPG_WIDTH_COUNT (UDATPG_NARROW + 1)
UnicodeString fieldDisplayNames[UDATPG_FIELD_COUNT][UDATPG_WIDTH_COUNT];
UnicodeString dateTimeFormat;
UnicodeString decimal;