feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merge branch 'develop' of https://github.com/boostorg/config into develop

Browse Source
This commit is contained in:
jzmaddock
2016-12-27 19:34:21 +00:00
parent ab0fa3b3d7 0c45ca206a
commit c03303bdcb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/config/compiler/intel.hpp
View File

@@ -39,15 +39,20 @@
# define BOOST_NO_CXX14_VARIABLE_TEMPLATES # define BOOST_NO_CXX14_VARIABLE_TEMPLATES
#endif #endif
#else #else // defined(_MSC_VER)
#include <boost/config/compiler/gcc.hpp> #include <boost/config/compiler/gcc.hpp>
#undef BOOST_GCC_VERSION #undef BOOST_GCC_VERSION
#undef BOOST_GCC_CXX11 #undef BOOST_GCC_CXX11
// Broken in all versions up to 17 (newer versions not tested)
#if (__INTEL_COMPILER <= 1700) && !defined(BOOST_NO_CXX14_CONSTEXPR)
# define BOOST_NO_CXX14_CONSTEXPR
#endif #endif
#endif // defined(_MSC_VER)
#undef BOOST_COMPILER #undef BOOST_COMPILER
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
@@ -92,7 +97,7 @@
# define BOOST_INTEL_LINUX BOOST_INTEL # define BOOST_INTEL_LINUX BOOST_INTEL
#endif #endif
#else #else // defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) && (defined(_MSC_VER) || defined(__GNUC__))
#include <boost/config/compiler/common_edg.hpp> #include <boost/config/compiler/common_edg.hpp>
@@ -483,7 +488,7 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
# undef BOOST_NO_CXX11_FINAL # undef BOOST_NO_CXX11_FINAL
#endif #endif
#endif #endif // defined(BOOST_INTEL_STDCXX0X)
// //
// Broken in all versions up to 15: // Broken in all versions up to 15:
@@ -500,11 +505,6 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
# define BOOST_NO_CXX11_HDR_TUPLE # define BOOST_NO_CXX11_HDR_TUPLE
#endif #endif
// Broken in all versions up to 17:
#if !defined(BOOST_NO_CXX14_CONSTEXPR)
#define BOOST_NO_CXX14_CONSTEXPR
#endif
#if (BOOST_INTEL_CXX_VERSION < 1200) #if (BOOST_INTEL_CXX_VERSION < 1200)
// //
// fenv.h appears not to work with Intel prior to 12.0: // fenv.h appears not to work with Intel prior to 12.0:
@@ -535,10 +535,10 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
# define BOOST_HAS_INT128 # define BOOST_HAS_INT128
#endif #endif
#endif #endif // defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) && (defined(_MSC_VER) || defined(__GNUC__))
// //
// last known and checked version: // last known and checked version:
#if (BOOST_INTEL_CXX_VERSION > 1500) #if (BOOST_INTEL_CXX_VERSION > 1700)
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results" # error "Unknown compiler version - please run the configure tests and report the results"
# elif defined(_MSC_VER) # elif defined(_MSC_VER)