[Python-checkins] CVS: python/dist/src/Objects object.c,2.140,2.141

[Neil Schemenauer]

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

Modified Files:
	object.c 
Log Message:
Remove GC related code.  It lives in gcmodule now.


Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.140
retrieving revision 2.141
diff -C2 -d -r2.140 -r2.141
*** object.c	2001/08/24 18:34:26	2.140
--- object.c	2001/08/29 23:54:03	2.141
***************
*** 94,99 ****
  		return op;
    	}
- 	if (PyType_IS_GC(tp))
- 		op = (PyObject *) PyObject_FROM_GC(op);
  	/* Any changes should be reflected in PyObject_INIT (objimpl.h) */
  	op->ob_type = tp;
--- 94,97 ----
***************
*** 110,115 ****
  		return op;
  	}
- 	if (PyType_IS_GC(tp))
- 		op = (PyVarObject *) PyObject_FROM_GC(op);
  	/* Any changes should be reflected in PyObject_INIT_VAR */
  	op->ob_size = size;
--- 108,111 ----
***************
*** 126,131 ****
  	if (op == NULL)
  		return PyErr_NoMemory();
- 	if (PyType_IS_GC(tp))
- 		op = (PyObject *) PyObject_FROM_GC(op);
  	return PyObject_INIT(op, tp);
  }
--- 122,125 ----
***************
*** 138,143 ****
  	if (op == NULL)
  		return (PyVarObject *)PyErr_NoMemory();
- 	if (PyType_IS_GC(tp))
- 		op = (PyVarObject *) PyObject_FROM_GC(op);
  	return PyObject_INIT_VAR(op, tp, size);
  }
--- 132,135 ----
***************
*** 146,161 ****
  _PyObject_Del(PyObject *op)
  {
- 	if (op && PyType_IS_GC(op->ob_type)) {
- 		op = (PyObject *) PyObject_AS_GC(op);
- 	}
  	PyObject_FREE(op);
  }
  
- #ifndef WITH_CYCLE_GC
- /* extension modules might need these */
- void _PyGC_Insert(PyObject *op) { }
- void _PyGC_Remove(PyObject *op) { }
- #endif
- 
  int
  PyObject_Print(PyObject *op, FILE *fp, int flags)
--- 138,144 ----
***************
*** 216,227 ****
  }
  
- #ifdef WITH_CYCLE_GC
- void _PyGC_Dump(PyGC_Head* op)
- {
- 	_PyObject_Dump(PyObject_FROM_GC(op));
- }
- #endif /* WITH_CYCLE_GC */
- 
- 
  PyObject *
  PyObject_Repr(PyObject *v)
--- 199,202 ----
***************
*** 1147,1151 ****
  		return NULL;
  	if (dictoffset < 0) {
! 		dictoffset += PyType_BASICSIZE(tp);
  		assert(dictoffset > 0); /* Sanity check */
  		if (tp->tp_itemsize > 0) {
--- 1122,1126 ----
  		return NULL;
  	if (dictoffset < 0) {
! 		dictoffset += tp->tp_basicsize;
  		assert(dictoffset > 0); /* Sanity check */
  		if (tp->tp_itemsize > 0) {