[Python-checkins] cpython (merge 3.2 -> default): Silence compiler warnings on Solaris 10 via explicit (void *) casts.
trent.nelson
python-checkins at python.org
Wed Sep 19 04:00:32 CEST 2012
http://hg.python.org/cpython/rev/650e1857a91e
changeset: 79049:650e1857a91e
parent: 79047:974a4cae6094
parent: 79048:e9e6e5104936
user: Trent Nelson <trent at trent.me>
date: Tue Sep 18 22:00:25 2012 -0400
summary:
Silence compiler warnings on Solaris 10 via explicit (void *) casts.
files:
Objects/typeobject.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5992,7 +5992,7 @@
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 @@
/* 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 @@
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. */
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list