diff --git a/include/boost/python/converter/arg_to_python_base.hpp b/include/boost/python/converter/arg_to_python_base.hpp index 59f68b6d..385a7839 100755 --- 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 index b20a2a9c..1740f6ee 100644 --- 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 index c034b066..e19ebfa7 100644 --- a/src/object/class.cpp +++ b/src/object/class.cpp @@ -268,7 +268,7 @@ namespace objects object module_name = PyObject_IsInstance(scope().ptr(), upcast(&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 index d84e2b36..39c95f6e 100644 --- a/src/object/inheritance.cpp +++ b/src/object/inheritance.cpp @@ -6,7 +6,7 @@ #include #include #include -#if defined(BOOST_MSVC) && _MSC_FULL_VER == 13102171 +#if _MSC_FULL_VER >= 13102171 && _MSC_FULL_VER <= 13102179 # include #endif #include