diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-02-19 12:22:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-02-19 12:22:29 +0000 |
| commit | 34990a8c94eb8ecd7780a47424b89d7ebb31ebf6 (patch) | |
| tree | d57c0e826fd7bcba6a69d1177496e5170f4180d7 /ACE/ace/config-icc-common.h | |
| parent | ac68bde5a1c3d1c17239daf791866677bfef4b27 (diff) | |
| download | ATCD-34990a8c94eb8ecd7780a47424b89d7ebb31ebf6.tar.gz | |
Wed Feb 19 12:23:19 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-icc-common.h:
Intel C++ 2013 SP1 Update 2 has adequate C++11 support when
it is used in GCC 4.7 or higher emulation mode
Diffstat (limited to 'ACE/ace/config-icc-common.h')
| -rw-r--r-- | ACE/ace/config-icc-common.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 6d1f1ff58d3..05cdc76a02b 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -97,5 +97,21 @@ # define ACE_HAS_IA32INTRIN_H #endif +// We assume that Intel C++ 15 and higher do have correct C++11 support when +// it runs with GCC 4.7 or higher emulation mode +#if (__INTEL_COMPILER > 1400) && defined (__INTEL_CXX11_MODE__) +# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) +# define ACE_HAS_CPP11 +# endif +#endif + +// Intel C++ 14 Update 2 has correct C++11 support when it runs with GCC 4.7 +// or higher emulation mode +#if (__INTEL_COMPILER == 1400) && (__INTEL_COMPILER_UPDATE >= 2) && defined (__INTEL_CXX11_MODE__) +# if (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) +# define ACE_HAS_CPP11 +# endi +#endif + #include /**/ "ace/post.h" #endif /* ACE_LINUX_ICC_COMMON_H */ |