mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-19 23:07:33 +09:00
Issue #1971 - Part 2: Update ICU source to 63.2.
This commit is contained in:
parent
8df84683be
commit
1e69214382
3160 changed files with 275815 additions and 234203 deletions
|
|
@ -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
|
||||
/*
|
||||
*******************************************************************************
|
||||
|
|
@ -177,7 +177,7 @@ void SimpleTimeZone::construct(int32_t rawOffsetGMT,
|
|||
|
||||
decodeRules(status);
|
||||
|
||||
if (savingsDST <= 0) {
|
||||
if (savingsDST == 0) {
|
||||
status = U_ILLEGAL_ARGUMENT_ERROR;
|
||||
}
|
||||
}
|
||||
|
|
@ -686,7 +686,7 @@ SimpleTimeZone::setRawOffset(int32_t offsetMillis)
|
|||
void
|
||||
SimpleTimeZone::setDSTSavings(int32_t millisSavedDuringDST, UErrorCode& status)
|
||||
{
|
||||
if (millisSavedDuringDST <= 0) {
|
||||
if (millisSavedDuringDST == 0) {
|
||||
status = U_ILLEGAL_ARGUMENT_ERROR;
|
||||
}
|
||||
else {
|
||||
|
|
@ -1189,13 +1189,22 @@ SimpleTimeZone::initTransitionRules(UErrorCode& status) {
|
|||
// Create a TimeZoneRule for initial time
|
||||
if (firstStdStart < firstDstStart) {
|
||||
initialRule = new InitialTimeZoneRule(tzid+UnicodeString(DST_STR), getRawOffset(), dstRule->getDSTSavings());
|
||||
if (initialRule == NULL) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
deleteTransitionRules();
|
||||
return;
|
||||
}
|
||||
firstTransition = new TimeZoneTransition(firstStdStart, *initialRule, *stdRule);
|
||||
} else {
|
||||
initialRule = new InitialTimeZoneRule(tzid+UnicodeString(STD_STR), getRawOffset(), 0);
|
||||
if (initialRule == NULL) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
deleteTransitionRules();
|
||||
return;
|
||||
}
|
||||
firstTransition = new TimeZoneTransition(firstDstStart, *initialRule, *dstRule);
|
||||
}
|
||||
// Check for null pointers.
|
||||
if (initialRule == NULL || firstTransition == NULL) {
|
||||
if (firstTransition == NULL) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
deleteTransitionRules();
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue