Patches for Intel C++ 7.0 beta

dabrahams · dabrahams · commit 31a8be0434b6 · 2002-09-26T00:15:36.000Z
[SVN r15520]
diff --git 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
@@ -54,7 +54,7 @@ template <class T>
 inline type_info type_id(boost::type<T>* = 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<T>()
diff --git 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<std::string const&>(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 
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ template <class T>`
`54`	`54`	`inline type_info type_id(boost::type<T>* = 0)`
`55`	`55`	`{`
`56`	`56`	`return type_info(`
`57`		`-# if (!defined(BOOST_MSVC) \|\| BOOST_MSVC > 1300) && (!defined(BOOST_INTEL_CXX_VERSION) \|\| BOOST_INTEL_CXX_VERSION > 600)`
	`57`	`+# if (!defined(BOOST_MSVC) \|\| BOOST_MSVC > 1300) && (!defined(BOOST_INTEL_CXX_VERSION) \|\| BOOST_INTEL_CXX_VERSION > 700)`
`58`	`58`	`typeid(T)`
`59`	`59`	`# else // strip the decoration which msvc and Intel mistakenly leave in`
`60`	`60`	`python::detail::msvc_typeid<T>()`