Skip to content

Commit 0e5eb8b

Browse files
targosBethGriggs
authored andcommitted
deps: restore minimum ICU version to 68
Refs: v8/v8@edac496 PR-URL: #39470 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent e8da1f2 commit 0e5eb8b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

deps/v8/src/objects/intl-objects.cc

+7
Original file line numberDiff line numberDiff line change
@@ -2036,12 +2036,19 @@ bool ICUTimezoneCache::GetOffsets(double time_ms, bool is_utc,
20362036
if (is_utc) {
20372037
GetTimeZone()->getOffset(time_ms, false, *raw_offset, *dst_offset, status);
20382038
} else {
2039+
#if U_ICU_VERSION_MAJOR_NUM < 69
2040+
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
2041+
->getOffsetFromLocal(time_ms, icu::BasicTimeZone::kFormer,
2042+
icu::BasicTimeZone::kFormer, *raw_offset,
2043+
*dst_offset, status);
2044+
#else
20392045
// Note that casting TimeZone to BasicTimeZone is safe because we know that
20402046
// icu::TimeZone used here is a BasicTimeZone.
20412047
static_cast<const icu::BasicTimeZone*>(GetTimeZone())
20422048
->getOffsetFromLocal(time_ms, UCAL_TZ_LOCAL_FORMER,
20432049
UCAL_TZ_LOCAL_FORMER, *raw_offset, *dst_offset,
20442050
status);
2051+
#endif
20452052
}
20462053

20472054
return U_SUCCESS(status);

deps/v8/src/objects/intl-objects.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "unicode/locid.h"
2222
#include "unicode/uversion.h"
2323

24-
#define V8_MINIMUM_ICU_VERSION 69
24+
#define V8_MINIMUM_ICU_VERSION 68
2525

2626
namespace U_ICU_NAMESPACE {
2727
class BreakIterator;

0 commit comments

Comments
 (0)