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

Define the Intel compiler and Microsoft C++ versions in the Q_CC_ macros

Browse Source 
This is for completeness, since we've done the same for Q_CC_GNU and
Q_CC_CLANG. We won't really use the macros like this because both
__INTEL_COMPILER and _MSC_VER are readily usable.

Change-Id: I669c60166fa4839d43f84f339e6896321d62817f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2014-11-04 11:42:08 -08:00
parent 729541f7ca
commit ffcad3244f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@
# define Q_NO_USING_KEYWORD # define Q_NO_USING_KEYWORD
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define Q_CC_MSVC # define Q_CC_MSVC (_MSC_VER)
# define Q_CC_MSVC_NET # define Q_CC_MSVC_NET
# define Q_OUTOFLINE_TEMPLATE inline # define Q_OUTOFLINE_TEMPLATE inline
# if _MSC_VER < 1600 # if _MSC_VER < 1600
@ -144,7 +144,7 @@
# endif # endif
# if defined(__INTEL_COMPILER) # if defined(__INTEL_COMPILER)
/* Intel C++ also masquerades as GCC */ /* Intel C++ also masquerades as GCC */
# define Q_CC_INTEL # define Q_CC_INTEL (__INTEL_COMPILER)
# define Q_ASSUME_IMPL(expr) __assume(expr) # define Q_ASSUME_IMPL(expr) __assume(expr)
# define Q_UNREACHABLE_IMPL() __builtin_unreachable() # define Q_UNREACHABLE_IMPL() __builtin_unreachable()
# if __INTEL_COMPILER >= 1300 && !defined(__APPLE__) # if __INTEL_COMPILER >= 1300 && !defined(__APPLE__)
@ -327,7 +327,7 @@
/* Using the `using' keyword avoids Intel C++ for Linux warnings */ /* Using the `using' keyword avoids Intel C++ for Linux warnings */
# elif defined(__INTEL_COMPILER) # elif defined(__INTEL_COMPILER)
# define Q_CC_INTEL # define Q_CC_INTEL (__INTEL_COMPILER)
/* Uses CFront, make sure to read the manual how to tweak templates. */ /* Uses CFront, make sure to read the manual how to tweak templates. */
# elif defined(__ghs) # elif defined(__ghs)