[Python-checkins] CVS: python/dist/src/Objects floatobject.c,2.77,2.78

[Guido van Rossum]

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

Modified Files:
	floatobject.c 
Log Message:
Rich comparisons fall-out:

- Get rid of float_cmp().

- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.


Index: floatobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
retrieving revision 2.77
retrieving revision 2.78
diff -C2 -r2.77 -r2.78
*** floatobject.c	2001/01/08 06:29:50	2.77
--- floatobject.c	2001/01/17 15:33:42	2.78
***************
*** 347,360 ****
  }
  
- /* Needed for the new style number compare slots */
- static PyObject *
- float_cmp(PyObject *v, PyObject *w)
- {
- 	double a,b;
- 	CONVERT_TO_DOUBLE(v, a);
- 	CONVERT_TO_DOUBLE(w, b);
- 	return PyInt_FromLong((a < b) ? -1 : (a > b) ? 1 : 0);
- }
- 
  static long
  float_hash(PyFloatObject *v)
--- 347,350 ----
***************
*** 671,677 ****
  	0,		/*nb_inplace_xor*/
  	0,		/*nb_inplace_or*/
- 
- 	/* New style slots: */
- 	(binaryfunc)float_cmp, /*nb_cmp*/
  };
  
--- 661,664 ----
***************
*** 697,701 ****
  	0,			/*tp_setattro*/
  	0,			/*tp_as_buffer*/
! 	Py_TPFLAGS_NEWSTYLENUMBER /*tp_flags*/
  };
  
--- 684,688 ----
  	0,			/*tp_setattro*/
  	0,			/*tp_as_buffer*/
! 	Py_TPFLAGS_CHECKTYPES	/*tp_flags*/
  };