This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author atropashko
Recipients
Date 2007-01-19.18:47:27
SpamBayes Score
Marked as misclassified
Message-id
In-reply-to
Content
slots member conflicts with Qt. I renamed it also. Patch follows:

--- Include/pyobject.h	3 Jan 2007 00:06:11 -0000	1.1
+++ Include/pyobject.h	19 Jan 2007 18:43:13 -0000
@@ -340,7 +340,7 @@
 					  a given operator (e.g. __getitem__).
 					  see add_operators() in typeobject.c . */
 	PyBufferProcs as_buffer;
-	PyObject *name, *slots;
+	PyObject *name, *slots_;
 	/* here are optional user slots, followed by the members. */
 } PyHeapTypeObject;
 
Index: Objects/typeobject.c
===================================================================
RCS file: /cvsroot/faultline/python/Objects/typeobject.c,v
retrieving revision 1.1.1.1
diff -d -u -r1.1.1.1 typeobject.c
--- Objects/typeobject.c	28 Dec 2006 18:35:24 -0000	1.1.1.1
+++ Objects/typeobject.c	19 Jan 2007 18:43:13 -0000
@@ -1811,7 +1811,7 @@
 	et = (PyHeapTypeObject *)type;
 	Py_INCREF(name);
 	et->name = name;
-	et->slots = slots;
+	et->slots_ = slots;
 
 	/* Initialize tp_flags */
 	type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE |
@@ -2116,7 +2116,7 @@
 	Py_XDECREF(type->tp_subclasses);
 	PyObject_Free(type->tp_doc);
 	Py_XDECREF(et->name);
-	Py_XDECREF(et->slots);
+	Py_XDECREF(et->slots_);
 	type->ob_type->tp_free((PyObject *)type);
 }
History
Date User Action Args
2007-08-23 14:50:54adminlinkissue1626545 messages
2007-08-23 14:50:54admincreate