@@ -163,37 +163,37 @@ KHASH_MAP_INIT_COMPLEX128(complex128, size_t)
163
163
#define kh_exist_complex128 (h , k ) (kh_exist(h, k))
164
164
165
165
166
- int PANDAS_INLINE floatobject_cmp (PyObject * a , PyObject * b ){
166
+ int PANDAS_INLINE floatobject_cmp (PyFloatObject * a , PyFloatObject * b ){
167
167
return Py_IS_NAN (PyFloat_AS_DOUBLE (a )) &&
168
168
Py_IS_NAN (PyFloat_AS_DOUBLE (b ));
169
169
}
170
170
171
171
172
- int PANDAS_INLINE complexobject_cmp (PyObject * a , PyObject * b ){
172
+ int PANDAS_INLINE complexobject_cmp (PyComplexObject * a , PyComplexObject * b ){
173
173
return (
174
- Py_IS_NAN (PyComplex_RealAsDouble ( a ) ) &&
175
- Py_IS_NAN (PyComplex_RealAsDouble ( b ) ) &&
176
- Py_IS_NAN (PyComplex_ImagAsDouble ( a ) ) &&
177
- Py_IS_NAN (PyComplex_ImagAsDouble ( b ) )
174
+ Py_IS_NAN (a -> cval . real ) &&
175
+ Py_IS_NAN (b -> cval . real ) &&
176
+ Py_IS_NAN (a -> cval . imag ) &&
177
+ Py_IS_NAN (b -> cval . imag )
178
178
)
179
179
||
180
180
(
181
- Py_IS_NAN (PyComplex_RealAsDouble ( a ) ) &&
182
- Py_IS_NAN (PyComplex_RealAsDouble ( b ) ) &&
183
- PyComplex_ImagAsDouble ( a ) == PyComplex_ImagAsDouble ( b )
181
+ Py_IS_NAN (a -> cval . real ) &&
182
+ Py_IS_NAN (b -> cval . real ) &&
183
+ a -> cval . imag == b -> cval . imag
184
184
)
185
185
||
186
186
(
187
- PyComplex_RealAsDouble ( a ) == PyComplex_RealAsDouble ( b ) &&
188
- Py_IS_NAN (PyComplex_ImagAsDouble ( a ) ) &&
189
- Py_IS_NAN (PyComplex_ImagAsDouble ( b ) )
187
+ a -> cval . real == b -> cval . real &&
188
+ Py_IS_NAN (a -> cval . imag ) &&
189
+ Py_IS_NAN (b -> cval . imag )
190
190
);
191
191
}
192
192
193
193
int PANDAS_INLINE pyobject_cmp (PyObject * a , PyObject * b );
194
194
195
195
196
- int PANDAS_INLINE tupleobject_cmp (PyObject * a , PyObject * b ){
196
+ int PANDAS_INLINE tupleobject_cmp (PyTupleObject * a , PyTupleObject * b ){
197
197
Py_ssize_t i ;
198
198
199
199
if (Py_SIZE (a ) != Py_SIZE (b )) {
@@ -220,13 +220,13 @@ int PANDAS_INLINE pyobject_cmp(PyObject* a, PyObject* b) {
220
220
return 0 ;
221
221
}
222
222
if (PyFloat_CheckExact (a )) {
223
- return floatobject_cmp (a , b );
223
+ return floatobject_cmp (( PyFloatObject * ) a , ( PyFloatObject * ) b );
224
224
}
225
225
if (PyComplex_CheckExact (a )) {
226
- return complexobject_cmp (a , b );
226
+ return complexobject_cmp (( PyComplexObject * ) a , ( PyComplexObject * ) b );
227
227
}
228
228
if (PyTuple_CheckExact (a )) {
229
- return tupleobject_cmp (a , b );
229
+ return tupleobject_cmp (( PyTupleObject * ) a , ( PyTupleObject * ) b );
230
230
}
231
231
}
232
232
return result ;
0 commit comments