From 6e0d708b8f17287e584831a927c4ce580375f194 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 28 Sep 2025 19:05:55 +0300 Subject: [PATCH] remove macros that override NumPy macros --- quaddtype/numpy_quaddtype/src/casts.cpp | 2 +- quaddtype/numpy_quaddtype/src/dragon4.c | 6 +++--- quaddtype/numpy_quaddtype/src/scalar.h | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/quaddtype/numpy_quaddtype/src/casts.cpp b/quaddtype/numpy_quaddtype/src/casts.cpp index bfd42966..3e25eaa7 100644 --- a/quaddtype/numpy_quaddtype/src/casts.cpp +++ b/quaddtype/numpy_quaddtype/src/casts.cpp @@ -904,4 +904,4 @@ free_casts(void) } } spec_count = 0; -} \ No newline at end of file +} diff --git a/quaddtype/numpy_quaddtype/src/dragon4.c b/quaddtype/numpy_quaddtype/src/dragon4.c index 58431411..dac8fa0b 100644 --- a/quaddtype/numpy_quaddtype/src/dragon4.c +++ b/quaddtype/numpy_quaddtype/src/dragon4.c @@ -2007,7 +2007,7 @@ Dragon4_Positional(PyObject *obj, DigitMode digit_mode, CutoffMode cutoff_mode, { npy_double v; - if (PyArray_IsScalar(obj, QuadPrecDType)) { + if (PyObject_TypeCheck(obj, &QuadPrecision_Type)) { QuadPrecisionObject *quad_obj = (QuadPrecisionObject *)obj; if (quad_obj->backend == BACKEND_SLEEF) { return Dragon4_Positional_QuadDType(&quad_obj->value.sleef_value, digit_mode, @@ -2030,7 +2030,7 @@ Dragon4_Scientific(PyObject *obj, DigitMode digit_mode, int precision, int min_d { npy_double val; - if (PyArray_IsScalar(obj, QuadPrecDType)) { + if (PyObject_TypeCheck(obj, &QuadPrecision_Type)) { QuadPrecisionObject *quad_obj = (QuadPrecisionObject *)obj; if (quad_obj->backend == BACKEND_SLEEF) { return Dragon4_Scientific_QuadDType(&quad_obj->value.sleef_value, digit_mode, precision, @@ -2044,4 +2044,4 @@ Dragon4_Scientific(PyObject *obj, DigitMode digit_mode, int precision, int min_d } return NULL; -} \ No newline at end of file +} diff --git a/quaddtype/numpy_quaddtype/src/scalar.h b/quaddtype/numpy_quaddtype/src/scalar.h index 4fac1adf..7499b1ad 100644 --- a/quaddtype/numpy_quaddtype/src/scalar.h +++ b/quaddtype/numpy_quaddtype/src/scalar.h @@ -31,11 +31,8 @@ QuadPrecision_from_object(PyObject *value, QuadBackendType backend); int init_quadprecision_scalar(void); -#define PyArray_IsScalar(obj, QuadPrecDType) PyObject_TypeCheck(obj, &QuadPrecision_Type) -#define PyArrayScalar_VAL(obj, QuadPrecDType) (((QuadPrecisionObject *)obj)->value) - #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif