summaryrefslogtreecommitdiff
path: root/boost/config/compiler/intel.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/config/compiler/intel.hpp')
-rw-r--r--boost/config/compiler/intel.hpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/boost/config/compiler/intel.hpp b/boost/config/compiler/intel.hpp
index 80969e9edd..1885ea281f 100644
--- a/boost/config/compiler/intel.hpp
+++ b/boost/config/compiler/intel.hpp
@@ -35,6 +35,10 @@
#endif
+#if (__INTEL_COMPILER <= 1600) && !defined(BOOST_NO_CXX14_VARIABLE_TEMPLATES)
+# define BOOST_NO_CXX14_VARIABLE_TEMPLATES
+#endif
+
#else
#include <boost/config/compiler/gcc.hpp>
@@ -496,6 +500,11 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
# define BOOST_NO_CXX11_HDR_TUPLE
#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)
//
// fenv.h appears not to work with Intel prior to 12.0: