wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-19 14:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1971 - Part 2: Update ICU source to 63.2.

Browse source
This commit is contained in:
Job Bautista 2022-07-24 21:03:27 +08:00 • committed by roytam1
commit 1e69214382
3160 changed files with 275815 additions and 234203 deletions
Download patch file Download diff file Expand all files Collapse all files

32
intl/icu/source/i18n/dtfmtsym.cpp
View file

@ -1,4 +1,4 @@
// Copyright (C) 2016 and later: Unicode, Inc. and others.
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
/*
*******************************************************************************
@ -1311,7 +1311,7 @@ DateFormatSymbols::initZoneStringsArray(void) {
UDate now = Calendar::getNow();
UnicodeString tzDispName;
while ((tzid = tzids->snext(status))) {
while ((tzid = tzids->snext(status)) != 0) {
if (U_FAILURE(status)) {
break;
}
@ -1368,7 +1368,7 @@ DateFormatSymbols::setZoneStrings(const UnicodeString* const *strings, int32_t r
//------------------------------------------------------
const UChar * U_EXPORT2
const char16_t * U_EXPORT2
DateFormatSymbols::getPatternUChars(void)
{
return gPatternChars;
@ -1630,20 +1630,24 @@ struct CalendarDataSink : public ResourceSink {
UnicodeString *aliasArray;
Hashtable *aliasMap;
if ((aliasArray = (UnicodeString*)arrays.get(*alias)) != NULL) {
// Clone the array
int32_t aliasArraySize = arraySizes.geti(*alias);
LocalArray<UnicodeString> aliasArrayCopy(new UnicodeString[aliasArraySize], errorCode);
if (U_FAILURE(errorCode)) { return; }
uprv_arrayCopy(aliasArray, aliasArrayCopy.getAlias(), aliasArraySize);
// Put the array on the 'arrays' map
UnicodeString *path = (UnicodeString*)aliasPathPairs[i + 1];
arrays.put(*path, aliasArrayCopy.orphan(), errorCode);
arraySizes.puti(*path, aliasArraySize, errorCode);
if (arrays.get(*path) == NULL) {
// Clone the array
int32_t aliasArraySize = arraySizes.geti(*alias);
LocalArray<UnicodeString> aliasArrayCopy(new UnicodeString[aliasArraySize], errorCode);
if (U_FAILURE(errorCode)) { return; }
uprv_arrayCopy(aliasArray, aliasArrayCopy.getAlias(), aliasArraySize);
// Put the array on the 'arrays' map
arrays.put(*path, aliasArrayCopy.orphan(), errorCode);
arraySizes.puti(*path, aliasArraySize, errorCode);
}
if (U_FAILURE(errorCode)) { return; }
mod = true;
} else if ((aliasMap = (Hashtable*)maps.get(*alias)) != NULL) {
UnicodeString *path = (UnicodeString*)aliasPathPairs[i + 1];
maps.put(*path, aliasMap, errorCode);
if (maps.get(*path) == NULL) {
maps.put(*path, aliasMap, errorCode);
}
if (U_FAILURE(errorCode)) { return; }
mod = true;
}
@ -2220,8 +2224,8 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError
++typeMapPtr;
}
if (typeMapPtr->usageTypeName != NULL && compResult == 0) {
fCapitalization[typeMapPtr->usageTypeEnumValue][0] = intVector[0];
fCapitalization[typeMapPtr->usageTypeEnumValue][1] = intVector[1];
fCapitalization[typeMapPtr->usageTypeEnumValue][0] = static_cast<UBool>(intVector[0]);
fCapitalization[typeMapPtr->usageTypeEnumValue][1] = static_cast<UBool>(intVector[1]);
}
}
}