From d7d9451361f9d0962f94e2b76f98a5e08c2054b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 10 Nov 2021 18:38:50 +0200 Subject: [PATCH] Fix 32-bit builds broken by mul_overflow() on qint64 Use std::integral_constant to avoid instantiating QIntegerForSize<16>, caused by 2b26dea51b26fff2ea955ad2b50c2c20194f0103 Change-Id: Ia6f49a1dcd82835c7e76200a650767fc519eab90 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/time/qtimezoneprivate_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/time/qtimezoneprivate_win.cpp b/src/corelib/time/qtimezoneprivate_win.cpp index 890a95c882..f144d7937a 100644 --- a/src/corelib/time/qtimezoneprivate_win.cpp +++ b/src/corelib/time/qtimezoneprivate_win.cpp @@ -280,7 +280,7 @@ QDate calculateTransitionLocalDate(const SYSTEMTIME &rule, int year) inline bool timeToMSecs(QDate date, QTime time, qint64 *msecs) { qint64 dayms = 0; - return mul_overflow(date.toJulianDay() - JULIAN_DAY_FOR_EPOCH, qint64(MSECS_PER_DAY), &dayms) + return mul_overflow(date.toJulianDay() - JULIAN_DAY_FOR_EPOCH, std::integral_constant(), &dayms) || add_overflow(dayms, qint64(time.msecsSinceStartOfDay()), msecs); }