[Python-checkins] CVS: python/dist/src/Objects cellobject.c,1.4,1.5

Neil Schemenauer nascheme@users.sourceforge.net
Wed, 29 Aug 2001 16:51:02 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv3072/Objects

Modified Files:
	cellobject.c 
Log Message:
Use new GC API.


Index: cellobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/cellobject.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cellobject.c	2001/08/24 18:34:26	1.4
--- cellobject.c	2001/08/29 23:51:00	1.5
***************
*** 8,16 ****
  	PyCellObject *op;
  
! 	op = (PyCellObject *)PyObject_New(PyCellObject, &PyCell_Type);
  	op->ob_ref = obj;
  	Py_XINCREF(obj);
  
! 	PyObject_GC_Init(op);
  	return (PyObject *)op;
  }
--- 8,16 ----
  	PyCellObject *op;
  
! 	op = (PyCellObject *)PyObject_GC_New(PyCellObject, &PyCell_Type);
  	op->ob_ref = obj;
  	Py_XINCREF(obj);
  
! 	_PyObject_GC_TRACK(op);
  	return (PyObject *)op;
  }
***************
*** 43,49 ****
  cell_dealloc(PyCellObject *op)
  {
! 	PyObject_GC_Fini(op);
  	Py_XDECREF(op->ob_ref);
! 	PyObject_Del(op);
  }
  
--- 43,49 ----
  cell_dealloc(PyCellObject *op)
  {
! 	_PyObject_GC_UNTRACK(op);
  	Py_XDECREF(op->ob_ref);
! 	PyObject_GC_Del(op);
  }
  
***************
*** 91,95 ****
  	0,
  	"cell",
! 	sizeof(PyCellObject) + PyGC_HEAD_SIZE,
  	0,
  	(destructor)cell_dealloc,               /* tp_dealloc */
--- 91,95 ----
  	0,
  	"cell",
! 	sizeof(PyCellObject),
  	0,
  	(destructor)cell_dealloc,               /* tp_dealloc */
***************
*** 108,112 ****
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,	/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)cell_traverse,		/* tp_traverse */
--- 108,112 ----
  	0,					/* tp_setattro */
  	0,					/* tp_as_buffer */
! 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
   	0,					/* tp_doc */
   	(traverseproc)cell_traverse,		/* tp_traverse */