From 31a8be0434b6825350e1f07bc3e67bc07b32d867 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 26 Sep 2002 00:15:36 +0000 Subject: [PATCH] Patches for Intel C++ 7.0 beta [SVN r15520] --- include/boost/python/detail/msvc_typeinfo.hpp | 2 +- include/boost/python/type_id.hpp | 2 +- test/extract.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/python/detail/msvc_typeinfo.hpp b/include/boost/python/detail/msvc_typeinfo.hpp index b50922b7..92f0f56d 100644 --- a/include/boost/python/detail/msvc_typeinfo.hpp +++ b/include/boost/python/detail/msvc_typeinfo.hpp @@ -18,7 +18,7 @@ // could probably be done, but I haven't figured it out yet. // -# if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(BOOST_INTEL_CXX_VERSION) && BOOST_INTEL_CXX_VERSION <= 600 +# if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(BOOST_INTEL_CXX_VERSION) && BOOST_INTEL_CXX_VERSION <= 700 namespace boost { namespace python { namespace detail { diff --git a/include/boost/python/type_id.hpp b/include/boost/python/type_id.hpp index cf818fe3..d44ce26a 100755 --- a/include/boost/python/type_id.hpp +++ b/include/boost/python/type_id.hpp @@ -54,7 +54,7 @@ template inline type_info type_id(boost::type* = 0) { return type_info( -# if (!defined(BOOST_MSVC) || BOOST_MSVC > 1300) && (!defined(BOOST_INTEL_CXX_VERSION) || BOOST_INTEL_CXX_VERSION > 600) +# if (!defined(BOOST_MSVC) || BOOST_MSVC > 1300) && (!defined(BOOST_INTEL_CXX_VERSION) || BOOST_INTEL_CXX_VERSION > 700) typeid(T) # else // strip the decoration which msvc and Intel mistakenly leave in python::detail::msvc_typeid() diff --git a/test/extract.cpp b/test/extract.cpp index 749f265a..2faa27e9 100644 --- a/test/extract.cpp +++ b/test/extract.cpp @@ -51,14 +51,14 @@ std::string const& extract_string_cref(object x) #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 # pragma warning(push) # pragma warning(disable:4172) // msvc lies about returning a reference to temporary -#elif defined(_MSC_VER) && defined(__ICL) && __ICL <= 600 +#elif defined(_MSC_VER) && defined(__ICL) && __ICL <= 700 # pragma warning(push) # pragma warning(disable:473) // intel/win32 does too #endif return extract(x); -#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(_MSC_VER) && defined(__ICL) && __ICL <= 600 +#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(_MSC_VER) && defined(__ICL) && __ICL <= 700 # pragma warning(pop) #endif }