From f207dd034b46999570ea8552c27dbc1b8e2e887b Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 15 Aug 2013 11:21:20 +0000
Subject: [PATCH] Fix for C++11 mode.

[SVN r85355]
---
 include/boost/config/compiler/intel.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 99842c9f..a2d4aec1 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -246,7 +246,8 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #  undef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
 // This one generates internal compiler errors in multiprecision, disabled for now:
 //#  undef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS  
-#  undef BOOST_NO_CXX11_NOEXCEPT
+// This one generates errors when used with conditional exception specifications, for example in multiprecision:
+//#  undef BOOST_NO_CXX11_NOEXCEPT
 #  undef BOOST_NO_CXX11_RANGE_BASED_FOR
 #  undef BOOST_NO_CXX11_SCOPED_ENUMS
 #  undef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX