Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 22:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

switched a few admissible cases from PyTuple_Set/GetItem -> PyTuple_SET/GET_ITEM

Browse Source
This commit is contained in:
Wenzel Jakob 2016-01-17 22:36:37 +01:00
parent 27e8e1066b
commit d0325bbd97
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/pybind11/cast.h
View File

@ -320,9 +320,9 @@ public:
bool load(PyObject *src, bool convert) { bool load(PyObject *src, bool convert) {
if (!PyTuple_Check(src) || PyTuple_Size(src) != 2) if (!PyTuple_Check(src) || PyTuple_Size(src) != 2)
return false; return false;
if (!first.load(PyTuple_GetItem(src, 0), convert)) if (!first.load(PyTuple_GET_ITEM(src, 0), convert))
return false; return false;
return second.load(PyTuple_GetItem(src, 1), convert); return second.load(PyTuple_GET_ITEM(src, 1), convert);
} }
static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent) { static PyObject *cast(const type &src, return_value_policy policy, PyObject *parent) {
@ -333,8 +333,8 @@ public:
PyObject *tuple = PyTuple_New(2); PyObject *tuple = PyTuple_New(2);
if (!tuple) if (!tuple)
return nullptr; return nullptr;
PyTuple_SetItem(tuple, 0, o1.release()); PyTuple_SET_ITEM(tuple, 0, o1.release());
PyTuple_SetItem(tuple, 1, o2.release()); PyTuple_SET_ITEM(tuple, 1, o2.release());
return tuple; return tuple;
} }
@ -422,7 +422,7 @@ protected:
return nullptr; return nullptr;
int counter = 0; int counter = 0;
for (auto & result : results) for (auto & result : results)
PyTuple_SetItem(tuple, counter++, result.release()); PyTuple_SET_ITEM(tuple, counter++, result.release());
return tuple; return tuple;
} }
@ -512,10 +512,10 @@ template <typename... Args> inline object handle::call(Args&&... args_) const {
throw cast_error("handle::call(): unable to convert input arguments to Python objects"); throw cast_error("handle::call(): unable to convert input arguments to Python objects");
object tuple(PyTuple_New(size), false); object tuple(PyTuple_New(size), false);
if (!tuple) if (!tuple)
throw cast_error("handle::call(): unable to convert input arguments to Python objects"); throw cast_error("handle::call(): unable to allocate tuple");
int counter = 0; int counter = 0;
for (auto & result : args) for (auto & result : args)
PyTuple_SetItem(tuple.ptr(), counter++, result.release()); PyTuple_SET_ITEM(tuple.ptr(), counter++, result.release());
PyObject *result = PyObject_CallObject(m_ptr, tuple.ptr()); PyObject *result = PyObject_CallObject(m_ptr, tuple.ptr());
if (result == nullptr && PyErr_Occurred()) if (result == nullptr && PyErr_Occurred())
throw error_already_set(); throw error_already_set();