diff options
| author | Alexander Shevchenko <sav_ix@ukr.net> | 2018-02-15 12:22:59 +0200 |
|---|---|---|
| committer | Alexander Shevchenko <sav_ix@ukr.net> | 2018-02-15 22:02:13 +0000 |
| commit | ad648ff293e1f1596f9d65205040c0f033b383ef (patch) | |
| tree | c79d3a87af4e8eba0333f52c8ee175aedcc2dfd7 | |
| parent | 1ef03f69e8416a70efd14df09e1231ce0bc00ea9 (diff) | |
fix missing __builtin_mul_overflow for Windows ICC
Complete 43c44d05ca6af4ec78c1dea84635375a637ff80d to cover builds
using Windows ICC.
Change-Id: I5f4d62f17b54835a58f3002744574c514cce5e39
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -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 9b86a16516..5f8a124bcc 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -168,7 +168,7 @@ namespace { // size_t. Implementations for 8- and 16-bit types will work but may not be as // efficient. Implementations for 64-bit may be missing on 32-bit platforms. -#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) || defined(Q_CC_INTEL)) || QT_HAS_BUILTIN(__builtin_add_overflowx) +#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) || (defined(Q_CC_INTEL) && !defined(Q_OS_WIN))) || QT_HAS_BUILTIN(__builtin_add_overflowx) // GCC 5, ICC 18, and Clang 3.8 have builtins to detect overflows template <typename T> inline |