diff options
| author | Martin Storsjö <martin@martin.st> | 2021-11-10 18:38:50 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-11-10 23:23:23 +0100 |
| commit | d7d9451361f9d0962f94e2b76f98a5e08c2054b8 (patch) | |
| tree | 27743dd82fecfad9f080527bc46e4e6d04cf407f /src/corelib/time | |
| parent | 3ba1a196aaac8f480c0fcb4fc005c1f4e7d7f88b (diff) | |
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 <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<qint64, MSECS_PER_DAY>(), &dayms) || add_overflow(dayms, qint64(time.msecsSinceStartOfDay()), msecs); } |