boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-23 17:52:17 +00:00
Code Issues Projects Releases Wiki Activity

MSVC6 workaround

Browse Source 
[SVN r14485]
This commit is contained in:
Dave Abrahams
2002-07-16 20:01:38 +00:00
parent 7a05b89a93
commit 1d2dc98f50
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/converter/from_python.cpp
View File

@@ -9,6 +9,7 @@
#include <boost/python/converter/rvalue_from_python_data.hpp>
#include <boost/python/handle.hpp>
#include <boost/python/detail/raw_pyobject.hpp>
#include <boost/python/cast.hpp>
#include <vector>
#include <algorithm>
@@ -222,15 +223,15 @@ BOOST_PYTHON_DECL void void_result_from_python(PyObject* o)
}
BOOST_PYTHON_DECL python::detail::new_reference
pytype_result_from_python(PyTypeObject* type, PyObject* source)
pytype_result_from_python(PyTypeObject* type_, PyObject* source)
{
if (!PyType_IsSubtype(source->ob_type, type))
if (!PyObject_IsInstance(source, python::upcast<PyObject>(type_)))
{
handle<> keeper(source);
handle<> msg(
::PyString_FromFormat(
"Expecting a Python %s return type, but got an object of type %s instead"
, type
, type_
, source->ob_type->tp_name
));
PyErr_SetObject(PyExc_TypeError, msg.get());