From c81d5731c3c8e6ab19b3afb7af3001ae1400600d Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 9 Sep 2013 16:16:31 +0000 Subject: [PATCH] Fix Intel 14 config in non-c++11 mode [SVN r85620] --- include/boost/config/compiler/intel.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index d1d373b7..3f0eaa18 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -255,7 +255,7 @@ template<> struct assert_intrinsic_wchar_t {}; #if (BOOST_INTEL_CXX_VERSION >= 1310) # undef BOOST_NO_SFINAE_EXPR #endif -#if (BOOST_INTEL_CXX_VERSION >= 1400) +#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1400) && !defined(_MSC_VER) # undef BOOST_NO_CXX11_UNICODE_LITERALS # undef BOOST_NO_CXX11_RAW_LITERALS // This one generates errors when used with conditional exception specifications, for example in multiprecision: