OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 12:20:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

deps: restore minimum ICU version to 68

Browse Source 
Refs: edac496818

PR-URL: https://github.com/nodejs/node/pull/39470
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
This commit is contained in:
Michaël Zasso 2021-07-20 16:39:01 +02:00 committed by Beth Griggs
parent e8da1f25fb
commit 0e5eb8b17d
No known key found for this signature in database
GPG Key ID: D7062848A1AB005C
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/v8/src/objects/intl-objects.cc vendored
View File

@ -2036,12 +2036,19 @@ bool ICUTimezoneCache::GetOffsets(double time_ms, bool is_utc,
if (is_utc) {
GetTimeZone()->getOffset(time_ms, false, *raw_offset, *dst_offset, status);
} else {
#if U_ICU_VERSION_MAJOR_NUM < 69
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
->getOffsetFromLocal(time_ms, icu::BasicTimeZone::kFormer,
icu::BasicTimeZone::kFormer, *raw_offset,
*dst_offset, status);
#else
// Note that casting TimeZone to BasicTimeZone is safe because we know that
// icu::TimeZone used here is a BasicTimeZone.
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
->getOffsetFromLocal(time_ms, UCAL_TZ_LOCAL_FORMER,
UCAL_TZ_LOCAL_FORMER, *raw_offset, *dst_offset,
status);
#endif
}
return U_SUCCESS(status);

2
deps/v8/src/objects/intl-objects.h vendored
View File

@ -21,7 +21,7 @@
#include "unicode/locid.h"
#include "unicode/uversion.h"
#define V8_MINIMUM_ICU_VERSION 69
#define V8_MINIMUM_ICU_VERSION 68
namespace U_ICU_NAMESPACE {
class BreakIterator;