VC7.1 alpha adjustments

dabrahams · dabrahams · commit c104f0167fbf · 2002-08-20T19:22:14.000Z
[SVN r15003]
diff --git a/include/boost/python/converter/arg_to_python_base.hpp b/include/boost/python/converter/arg_to_python_base.hpp
@@ -16,12 +16,12 @@ struct registration;
 namespace detail
 {
   struct BOOST_PYTHON_DECL arg_to_python_base
-# if !defined(BOOST_MSVC) || BOOST_MSVC <= 1300 || _MSC_FULL_VER > 13102171
+# if !defined(BOOST_MSVC) || BOOST_MSVC <= 1300 || _MSC_FULL_VER > 13102179
       : handle<>
 # endif 
   {
       arg_to_python_base(void const volatile* source, registration const&);
-# if defined(BOOST_MSVC) && BOOST_MSVC > 1300 && _MSC_FULL_VER <= 13102171
+# if defined(BOOST_MSVC) && BOOST_MSVC > 1300 && _MSC_FULL_VER <= 13102179
       PyObject* get() const { return m_ptr.get(); }
       PyObject* release() { return m_ptr.release(); }
    private:
diff --git a/src/converter/arg_to_python_base.cpp b/src/converter/arg_to_python_base.cpp
@@ -38,7 +38,7 @@ namespace detail
 {
   arg_to_python_base::arg_to_python_base(
       void const volatile* source, registration const& converters)
-# if !defined(BOOST_MSVC) || _MSC_FULL_VER != 13102171
+# if !defined(BOOST_MSVC) || BOOST_MSVC <= 1300 || _MSC_FULL_VER > 13102179
       : handle<>(converter::convert_to_python(source, converters))
 # else
       : m_ptr(converter::convert_to_python(source, converters))
diff --git a/src/object/class.cpp b/src/object/class.cpp
@@ -268,7 +268,7 @@ namespace objects
 
       object module_name = PyObject_IsInstance(scope().ptr(), upcast<PyObject>(&PyModule_Type))
           ? scope().attr("__name__")
-          : getattr(scope(), "__module__", object(""))
+          : api::getattr(scope(), "__module__", object(""))
           ;
 
       if (module_name)
diff --git a/src/object/inheritance.cpp b/src/object/inheritance.cpp
@@ -6,7 +6,7 @@
 #include <boost/python/object/inheritance.hpp>
 #include <boost/python/type_id.hpp>
 #include <boost/graph/breadth_first_search.hpp>
-#if defined(BOOST_MSVC) && _MSC_FULL_VER == 13102171
+#if _MSC_FULL_VER >= 13102171 && _MSC_FULL_VER <= 13102179
 # include <boost/graph/reverse_graph.hpp>
 #endif 
 #include <boost/graph/adjacency_list.hpp>

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace detail`
`38`	`38`	`{`
`39`	`39`	`arg_to_python_base::arg_to_python_base(`
`40`	`40`	`void const volatile* source, registration const& converters)`
`41`		`-# if !defined(BOOST_MSVC) \|\| _MSC_FULL_VER != 13102171`
	`41`	`+# if !defined(BOOST_MSVC) \|\| BOOST_MSVC <= 1300 \|\| _MSC_FULL_VER > 13102179`
`42`	`42`	`: handle<>(converter::convert_to_python(source, converters))`
`43`	`43`	`# else`
`44`	`44`	`: m_ptr(converter::convert_to_python(source, converters))`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ namespace objects`
`268`	`268`
`269`	`269`	`object module_name = PyObject_IsInstance(scope().ptr(), upcast<PyObject>(&PyModule_Type))`
`270`	`270`	`? scope().attr("__name__")`
`271`		`- : getattr(scope(), "__module__", object(""))`
	`271`	`+ : api::getattr(scope(), "__module__", object(""))`
`272`	`272`	`;`
`273`	`273`
`274`	`274`	`if (module_name)`