boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-27 07:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix tru64cxx problems, remove operator*/-> from object

Browse Source 
[SVN r14173]
This commit is contained in:
Dave Abrahams
2002-06-19 02:12:14 +00:00
parent 66f2cd81a8
commit 8aba486295
6 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_operators.cpp
View File

@@ -13,7 +13,7 @@ BOOST_PYTHON_DECL object operator op(object const& l, object const& r) \
{ \
return object( \
(object::new_pyobject_reference*) \
PyNumber_##name(&*l, &*r)); \
PyNumber_##name(l.ptr().get(), r.ptr().get())); \
}
BOOST_PYTHON_BINARY_OPERATOR(+, Add)
@@ -33,7 +33,7 @@ BOOST_PYTHON_DECL object& operator op##=(object& l, object const& r) \
{ \
return l = object( \
(object::new_pyobject_reference*) \
PyNumber_InPlace##name(&*l, &*r)); \
PyNumber_InPlace##name(l.ptr().get(), r.ptr().get())); \
}
BOOST_PYTHON_INPLACE_OPERATOR(+, Add)

8
src/object_protocol.cpp
View File

@@ -12,23 +12,23 @@ namespace boost { namespace python { namespace api {
BOOST_PYTHON_DECL object getattr(object const& target, object const& key)
{
return object((object::new_pyobject_reference*)PyObject_GetAttr(&*target, &*key));
return object((object::new_pyobject_reference*)PyObject_GetAttr(target.ptr().get(), key.ptr().get()));
}
BOOST_PYTHON_DECL void setattr(object const& target, object const& key, object const& value)
{
if (PyObject_SetAttr(&*target, &*key, &*value) == -1)
if (PyObject_SetAttr(target.ptr().get(), key.ptr().get(), value.ptr().get()) == -1)
throw_error_already_set();
}
BOOST_PYTHON_DECL object getitem(object const& target, object const& key)
{
return object((object::new_pyobject_reference*)PyObject_GetItem(&*target, &*key));
return object((object::new_pyobject_reference*)PyObject_GetItem(target.ptr().get(), key.ptr().get()));
}
BOOST_PYTHON_DECL void setitem(object const& target, object const& key, object const& value)
{
if (PyObject_SetItem(&*target, &*key, &*value) == -1)
if (PyObject_SetItem(target.ptr().get(), key.ptr().get(), value.ptr().get()) == -1)
throw_error_already_set();
}