diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-17 15:52:57 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-18 16:47:20 +0200 |
| commit | a29b65af05b4d501e6b1d8a72be50366666a3caa (patch) | |
| tree | 07c9d84730ab64ce78f9b496cf87b558d6c2dd3b | |
| parent | a8a6728a3f3f21d0e931800ff434e3d9ff654fb0 (diff) | |
Add the C++11 feature macros for ICC 15 and complete for 14
ICC 14 (Intel Composer XE 2013) already supported range for and explicit
conversions, but looks like we missed adding them.
ICC 15 (Intel Composer XE 2015) is C++11 language feature complete.
Change-Id: I6eb8a3059f5df3604716666311aa01a6cf01918d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index bb892cf751..db8ca4daa5 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -534,12 +534,21 @@ # if __INTEL_COMPILER >= 1400 # define Q_COMPILER_CONSTEXPR # define Q_COMPILER_DELEGATING_CONSTRUCTORS +# define Q_COMPILER_EXPLICIT_CONVERSIONS # define Q_COMPILER_EXPLICIT_OVERRIDES # define Q_COMPILER_NONSTATIC_MEMBER_INIT +# define Q_COMPILER_RANGE_FOR # define Q_COMPILER_RAW_STRINGS # define Q_COMPILER_REF_QUALIFIERS # define Q_COMPILER_UNRESTRICTED_UNIONS # endif +# if __INTEL_COMPILER >= 1500 +# define Q_COMPILER_ALIGNAS +# define Q_COMPILER_ALIGNOF +# define Q_COMPILER_INHERITING_CONSTRUCTORS +# define Q_COMPILER_THREAD_LOCAL +# define Q_COMPILER_UDL +# endif # endif #endif |