1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the version of ICC that has the constexpr bug fixed

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2015-01-22 08:24:34 -08:00 committed by Jani Heikkinen
parent 4b707d3bde
commit 8172fe4647
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/global/qcompilerdetection.h
View File

@ -557,7 +557,10 @@
# define Q_COMPILER_UNRESTRICTED_UNIONS # define Q_COMPILER_UNRESTRICTED_UNIONS
# endif # endif
# if __INTEL_COMPILER >= 1500 # if __INTEL_COMPILER >= 1500
# if __INTEL_COMPILER * 100 + __INTEL_COMPILER_UPDATE >= 150001
// the bug mentioned above is fixed in 15.0.1
# define Q_COMPILER_CONSTEXPR # define Q_COMPILER_CONSTEXPR
# endif
# define Q_COMPILER_ALIGNAS # define Q_COMPILER_ALIGNAS
# define Q_COMPILER_ALIGNOF # define Q_COMPILER_ALIGNOF
# define Q_COMPILER_INHERITING_CONSTRUCTORS # define Q_COMPILER_INHERITING_CONSTRUCTORS