summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-09-19 01:58:03 (GMT)
committerTrent Nelson <trent@trent.me>2012-09-19 01:58:03 (GMT)
commitab02db23b1032c7b1fcf7063ae736b25e4466624 (patch)
tree040ed022115cbcbd167c7b53ea9ad82a9c66b4dc /Objects
parent16d2b478372ba68923f8e325c75202416aaeaa93 (diff)
downloadcpython-ab02db23b1032c7b1fcf7063ae736b25e4466624.zip
cpython-ab02db23b1032c7b1fcf7063ae736b25e4466624.tar.gz
cpython-ab02db23b1032c7b1fcf7063ae736b25e4466624.tar.bz2
Silence compiler warnings on Solaris 10 via explicit (void *) casts.
(Compiler: Solaris Studio 12.3)
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 0fc0ad3..fd2ae67 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5772,7 +5772,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;
}
@@ -5819,7 +5819,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;
@@ -6034,7 +6034,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. */