]> granicus.if.org Git - python/commitdiff
Silence compiler warnings on Solaris 10 via explicit (void *) casts.
authorTrent Nelson <trent@trent.me>
Wed, 19 Sep 2012 01:58:03 +0000 (21:58 -0400)
committerTrent Nelson <trent@trent.me>
Wed, 19 Sep 2012 01:58:03 +0000 (21:58 -0400)
(Compiler: Solaris Studio 12.3)

Objects/typeobject.c

index 0fc0ad38e82a06f5455cc2e1f99698f7143054f9..fd2ae67d860f598242c3c205470f2315c12886c8 100644 (file)
@@ -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. */