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

Subject: [Boost-commit] svn:boost r85254 - trunk/boost/config/compiler
From: john_at_[hidden]
Date: 2013-08-09 12:12:39

Author: johnmaddock
Date: 2013-08-09 12:12:38 EDT (Fri, 09 Aug 2013)
New Revision: 85254
URL: http://svn.boost.org/trac/boost/changeset/85254

Log:
Ooops, previous commit broke Intel on Win32.

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

Modified: trunk/boost/config/compiler/intel.hpp
==============================================================================
--- trunk/boost/config/compiler/intel.hpp	Fri Aug  9 08:27:11 2013	(r85253)
+++ trunk/boost/config/compiler/intel.hpp	2013-08-09 12:12:38 EDT (Fri, 09 Aug 2013)	(r85254)
@@ -246,10 +246,11 @@
 // continues to list scoped enum support as "Partial"
 //#  undef  BOOST_NO_CXX11_SCOPED_ENUMS
 #endif
-#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1310)
+#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1310) && !defined(_MSC_VER)
 #  undef BOOST_NO_CXX11_INLINE_NAMESPACES
 #  undef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-#  undef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+// This one generates internal compiler errors in multiprecision, disabled for now:
+//#  undef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS  
 #  undef BOOST_NO_CXX11_NOEXCEPT
 #  undef BOOST_NO_CXX11_RANGE_BASED_FOR
 #  undef BOOST_NO_CXX11_SCOPED_ENUMS