summaryrefslogtreecommitdiff
path: root/python/modules/IcePy/Util.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-01-11 17:48:15 -0500
committerBernard Normier <bernard@zeroc.com>2017-01-11 17:48:15 -0500
commit05485a47ea107737ada8b0941a7a066c6a075f40 (patch)
tree8bf8a5fee750b20a631f02f60e6db21788ecc14f /python/modules/IcePy/Util.cpp
parentMoved UniquePtr to IceInternal (diff)
downloadice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.bz2
ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.xz
ice-05485a47ea107737ada8b0941a7a066c6a075f40.zip
Replace NULL by ICE_NULLPTR
Diffstat (limited to 'python/modules/IcePy/Util.cpp')
-rw-r--r--python/modules/IcePy/Util.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
index 8d0cd602aae..953bbee84a0 100644
--- a/python/modules/IcePy/Util.cpp
+++ b/python/modules/IcePy/Util.cpp
@@ -118,13 +118,13 @@ versionToString(PyObject* args, const char* type)
PyObject* p;
if(!PyArg_ParseTuple(args, STRCAST("O!"), versionType, &p))
{
- return NULL;
+ return ICE_NULLPTR;
}
T v;
if(!getVersion<T>(p, v, type))
{
- return NULL;
+ return ICE_NULLPTR;
}
string s;
@@ -135,7 +135,7 @@ versionToString(PyObject* args, const char* type)
catch(const Ice::Exception& ex)
{
IcePy::setPythonException(ex);
- return NULL;
+ return ICE_NULLPTR;
}
return createString(s);
}
@@ -146,7 +146,7 @@ stringToVersion(PyObject* args, const char* type)
char* str;
if(!PyArg_ParseTuple(args, STRCAST("s"), &str))
{
- return NULL;
+ return ICE_NULLPTR;
}
T v;
@@ -157,7 +157,7 @@ stringToVersion(PyObject* args, const char* type)
catch(const Ice::Exception& ex)
{
IcePy::setPythonException(ex);
- return NULL;
+ return ICE_NULLPTR;
}
return createVersion<T>(v, type);