summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-02-26 18:56:37 (GMT)
committerFred Drake <fdrake@acm.org>2001-02-26 18:56:37 (GMT)
commitb60654bc15597f4b08fb6d97774d655ae5176ca4 (patch)
treec0ced5ef94b82d6a48e24c80de8f2b7c3cffde7e /Objects
parent4f9b13bac8335d4614499673a3349b2c97401f12 (diff)
downloadcpython-b60654bc15597f4b08fb6d97774d655ae5176ca4.zip
cpython-b60654bc15597f4b08fb6d97774d655ae5176ca4.tar.gz
cpython-b60654bc15597f4b08fb6d97774d655ae5176ca4.tar.bz2
The return value from PyObject_ClearWeakRefs() is no longer meaningful,
so make it void.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/classobject.c3
-rw-r--r--Objects/object.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 9cca19f..00cfdde 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -516,8 +516,7 @@ instance_dealloc(register PyInstanceObject *inst)
extern long _Py_RefTotal;
#endif
- if (!PyObject_ClearWeakRefs((PyObject *) inst))
- return;
+ PyObject_ClearWeakRefs((PyObject *) inst);
/* Temporarily resurrect the object. */
#ifdef Py_TRACE_REFS
diff --git a/Objects/object.c b/Objects/object.c
index 8a898f8..db7d518 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1475,13 +1475,13 @@ PyObject_Free(void *p)
call site instead of requiring a test for NULL.
*/
-static int
+static void
empty_clear_weak_refs(PyObject *o)
{
- return 1;
+ return;
}
-int (*PyObject_ClearWeakRefs)(PyObject *) = empty_clear_weak_refs;
+void (*PyObject_ClearWeakRefs)(PyObject *) = empty_clear_weak_refs;