diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-12-10 18:55:09 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-12-14 18:26:10 +0000 |
| commit | e3d1f8d0753cc0f7486378bdc41fad9bde4b6d5c (patch) | |
| tree | ace657f63d998b4147bece094e5097e0122021a5 /src/corelib | |
| parent | 193d19d86e2c5408c3691b47f2bc89df124112a5 (diff) | |
Fix build in INTEGRITY: __mulh is not defined
Commit 6b875f0625acc6c6a4f8899b829176baaf7d8502 created a macro for it,
but in the multiple updates to find the best solution, we forgot to use
it.
Fixes: QTBUG-72429
Change-Id: I4ac1156702324f0fb814fffd156f27c1789d1409
Reviewed-by: Thomas Miller <thomaslmiller91@gmail.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnumeric_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 5326d9485b..dd59f97f8b 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -348,7 +348,7 @@ template <> inline bool mul_overflow(qint64 v1, qint64 v2, qint64 *r) // as signed for the low bits and use a signed right shift to verify that // 'high' is nothing but sign bits that match the sign of 'low'. - qint64 high = __mulh(v1, v2); + qint64 high = Q_SMULH(v1, v2); *r = qint64(quint64(v1) * quint64(v2)); return (*r >> 63) != high; } |