diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-22 08:24:34 -0800 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-01-29 09:30:12 +0000 |
| commit | 8172fe46472614d4ecf6fce03ae5c5f706820cd7 (patch) | |
| tree | 2e81c4988adbe51eacc36fbbdc8b286079088a33 | |
| parent | 4b707d3bde53dd6dd4c01a51c12f096faefbc5b2 (diff) | |
Correct the version of ICC that has the constexpr bug fixed
01fc82e3574614762d2ce061dd45ce4995c79e7f updated the code for ICC 15,
but it needs to be 15.0.1
Change-Id: Iba8d819ab9174d9dac07ffff13bbc26b9be46d53
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 3f813e163b..7be4ed8bef 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -557,7 +557,10 @@ # define Q_COMPILER_UNRESTRICTED_UNIONS # endif # if __INTEL_COMPILER >= 1500 -# define Q_COMPILER_CONSTEXPR +# if __INTEL_COMPILER * 100 + __INTEL_COMPILER_UPDATE >= 150001 +// the bug mentioned above is fixed in 15.0.1 +# define Q_COMPILER_CONSTEXPR +# endif # define Q_COMPILER_ALIGNAS # define Q_COMPILER_ALIGNOF # define Q_COMPILER_INHERITING_CONSTRUCTORS |