From 06441f70b8bfd848992c868a8c7085276527ffbd Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 9 Aug 2013 16:12:38 +0000 Subject: [PATCH] Ooops, previous commit broke Intel on Win32. [SVN r85254] --- include/boost/config/compiler/intel.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index 48ed1a23..f6ce03ad 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -246,10 +246,11 @@ template<> struct assert_intrinsic_wchar_t {}; // 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