diff options
Diffstat (limited to 'py/modules/IcePy/ObjectFactory.cpp')
| -rw-r--r-- | py/modules/IcePy/ObjectFactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/py/modules/IcePy/ObjectFactory.cpp b/py/modules/IcePy/ObjectFactory.cpp index 4ad93108cc4..57fc313ec5b 100644 --- a/py/modules/IcePy/ObjectFactory.cpp +++ b/py/modules/IcePy/ObjectFactory.cpp @@ -51,7 +51,7 @@ IcePy::ObjectFactory::create(const string& id) // Invoke the create method on the Python factory object. // PyObjectHandle obj = PyObject_CallMethod(p->second, STRCAST("create"), STRCAST("s"), id.c_str()); - if(obj.get() == NULL) + if(!obj.get()) { throw AbortMarshaling(); } @@ -73,10 +73,10 @@ IcePy::ObjectFactory::create(const string& id) // // Instantiate the object. // - PyTypeObject* type = (PyTypeObject*)info->pythonType.get(); + PyTypeObject* type = reinterpret_cast<PyTypeObject*>(info->pythonType.get()); PyObjectHandle args = PyTuple_New(0); - PyObjectHandle obj = type->tp_new(type, args.get(), NULL); - if(obj.get() == NULL) + PyObjectHandle obj = type->tp_new(type, args.get(), 0); + if(!obj.get()) { throw AbortMarshaling(); } @@ -100,7 +100,7 @@ IcePy::ObjectFactory::destroy() // // Invoke the destroy method on each registered Python factory. // - PyObjectHandle obj = PyObject_CallMethod(p->second, STRCAST("destroy"), NULL); + PyObjectHandle obj = PyObject_CallMethod(p->second, STRCAST("destroy"), 0); PyErr_Clear(); Py_DECREF(p->second); } |