summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-09-19 02:00:25 (GMT)
committerTrent Nelson <trent@trent.me>2012-09-19 02:00:25 (GMT)
commitda064d074556cb61309e13193d0b353668f76a49 (patch)
tree2e71ac83a7bebb2ae692c9bd60b99f715504bfeb
parent9a46105a897f6a4d6e2cf74cdb215d934fab76d9 (diff)
parentab02db23b1032c7b1fcf7063ae736b25e4466624 (diff)
downloadcpython-da064d074556cb61309e13193d0b353668f76a49.zip
cpython-da064d074556cb61309e13193d0b353668f76a49.tar.gz
cpython-da064d074556cb61309e13193d0b353668f76a49.tar.bz2
Silence compiler warnings on Solaris 10 via explicit (void *) casts.
-rw-r--r--Objects/typeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 88cca93..5d625a2 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5992,7 +5992,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
descr = _PyType_Lookup(type, p->name_strobj);
if (descr == NULL) {
if (ptr == (void**)&type->tp_iternext) {
- specific = _PyObject_NextNotImplemented;
+ specific = (void *)_PyObject_NextNotImplemented;
}
continue;
}
@@ -6039,7 +6039,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
/* We specifically allow __hash__ to be set to None
to prevent inheritance of the default
implementation from object.__hash__ */
- specific = PyObject_HashNotImplemented;
+ specific = (void *)PyObject_HashNotImplemented;
}
else {
use_generic = 1;
@@ -6254,7 +6254,7 @@ add_operators(PyTypeObject *type)
continue;
if (PyDict_GetItem(dict, p->name_strobj))
continue;
- if (*ptr == PyObject_HashNotImplemented) {
+ if (*ptr == (void *)PyObject_HashNotImplemented) {
/* Classes may prevent the inheritance of the tp_hash
slot by storing PyObject_HashNotImplemented in it. Make it
visible as a None value for the __hash__ attribute. */