bug 1493: removing use of NULL bug 1852: fixing compiler warnings bug 1853:

    fixing compiler warnings bug 2098: change proxy factory methods to
    return object of same class

1 files changed, 19 insertions, 19 deletions

diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp
index 1fbab0e97bb..28ca4c8427f 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/py/modules/IcePy/Init.cpp
@@ -29,43 +29,43 @@ extern "C" PyObject* Ice_registerTypes(PyObject*, PyObject*);
 
 static PyMethodDef methods[] =
 {
-    { STRCAST("identityToString"), (PyCFunction)IcePy_identityToString, METH_VARARGS,
+    { STRCAST("identityToString"), reinterpret_cast<PyCFunction>(IcePy_identityToString), METH_VARARGS,
         PyDoc_STR(STRCAST("identityToString(id) -> string")) },
-    { STRCAST("stringToIdentity"), (PyCFunction)IcePy_stringToIdentity, METH_VARARGS,
+    { STRCAST("stringToIdentity"), reinterpret_cast<PyCFunction>(IcePy_stringToIdentity), METH_VARARGS,
         PyDoc_STR(STRCAST("stringToIdentity(str) -> Ice.Identity")) },
-    { STRCAST("generateUUID"), (PyCFunction)IcePy_generateUUID, METH_NOARGS,
+    { STRCAST("generateUUID"), reinterpret_cast<PyCFunction>(IcePy_generateUUID), METH_NOARGS,
         PyDoc_STR(STRCAST("generateUUID() -> string")) },
-    { STRCAST("createProperties"), (PyCFunction)IcePy_createProperties, METH_VARARGS,
+    { STRCAST("createProperties"), reinterpret_cast<PyCFunction>(IcePy_createProperties), METH_VARARGS,
         PyDoc_STR(STRCAST("createProperties([args]) -> Ice.Properties")) },
-    { STRCAST("getProcessLogger"), (PyCFunction)IcePy_getProcessLogger, METH_NOARGS,
+    { STRCAST("getProcessLogger"), reinterpret_cast<PyCFunction>(IcePy_getProcessLogger), METH_NOARGS,
         PyDoc_STR(STRCAST("getProcessLogger() -> Ice.Logger")) },
-    { STRCAST("setProcessLogger"), (PyCFunction)IcePy_setProcessLogger, METH_VARARGS,
+    { STRCAST("setProcessLogger"), reinterpret_cast<PyCFunction>(IcePy_setProcessLogger), METH_VARARGS,
         PyDoc_STR(STRCAST("setProcessLogger(logger) -> None")) },
-    { STRCAST("defineEnum"), (PyCFunction)IcePy_defineEnum, METH_VARARGS,
+    { STRCAST("defineEnum"), reinterpret_cast<PyCFunction>(IcePy_defineEnum), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineStruct"), (PyCFunction)IcePy_defineStruct, METH_VARARGS,
+    { STRCAST("defineStruct"), reinterpret_cast<PyCFunction>(IcePy_defineStruct), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineSequence"), (PyCFunction)IcePy_defineSequence, METH_VARARGS,
+    { STRCAST("defineSequence"), reinterpret_cast<PyCFunction>(IcePy_defineSequence), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineDictionary"), (PyCFunction)IcePy_defineDictionary, METH_VARARGS,
+    { STRCAST("defineDictionary"), reinterpret_cast<PyCFunction>(IcePy_defineDictionary), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("declareProxy"), (PyCFunction)IcePy_declareProxy, METH_VARARGS,
+    { STRCAST("declareProxy"), reinterpret_cast<PyCFunction>(IcePy_declareProxy), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineProxy"), (PyCFunction)IcePy_defineProxy, METH_VARARGS,
+    { STRCAST("defineProxy"), reinterpret_cast<PyCFunction>(IcePy_defineProxy), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("declareClass"), (PyCFunction)IcePy_declareClass, METH_VARARGS,
+    { STRCAST("declareClass"), reinterpret_cast<PyCFunction>(IcePy_declareClass), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineClass"), (PyCFunction)IcePy_defineClass, METH_VARARGS,
+    { STRCAST("defineClass"), reinterpret_cast<PyCFunction>(IcePy_defineClass), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("defineException"), (PyCFunction)IcePy_defineException, METH_VARARGS,
+    { STRCAST("defineException"), reinterpret_cast<PyCFunction>(IcePy_defineException), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("stringify"), (PyCFunction)IcePy_stringify, METH_VARARGS,
+    { STRCAST("stringify"), reinterpret_cast<PyCFunction>(IcePy_stringify), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("stringifyException"), (PyCFunction)IcePy_stringifyException, METH_VARARGS,
+    { STRCAST("stringifyException"), reinterpret_cast<PyCFunction>(IcePy_stringifyException), METH_VARARGS,
         PyDoc_STR(STRCAST("internal function")) },
-    { STRCAST("loadSlice"), (PyCFunction)IcePy_loadSlice, METH_VARARGS,
+    { STRCAST("loadSlice"), reinterpret_cast<PyCFunction>(IcePy_loadSlice), METH_VARARGS,
         PyDoc_STR(STRCAST("loadSlice(cmd) -> None")) },
-    { NULL, NULL} /* sentinel */
+    { 0, 0 } /* sentinel */
 };
 
 PyDoc_STRVAR(moduleDoc, "The Internet Communications Engine.");