[Boost-commit] svn:boost r85620 - trunk/boost/config/compiler

Subject: [Boost-commit] svn:boost r85620 - trunk/boost/config/compiler
From: john_at_[hidden]
Date: 2013-09-09 12:16:32

Author: johnmaddock
Date: 2013-09-09 12:16:31 EDT (Mon, 09 Sep 2013)
New Revision: 85620
URL: http://svn.boost.org/trac/boost/changeset/85620

Log:
Fix Intel 14 config in non-c++11 mode

Text files modified: 
   trunk/boost/config/compiler/intel.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/boost/config/compiler/intel.hpp
==============================================================================
--- trunk/boost/config/compiler/intel.hpp	Mon Sep  9 07:52:30 2013	(r85619)
+++ trunk/boost/config/compiler/intel.hpp	2013-09-09 12:16:31 EDT (Mon, 09 Sep 2013)	(r85620)
@@ -255,7 +255,7 @@
 #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: