Merge pull request #160 from mattip/isscalar

remove macros that override NumPy macros

Author: charris

quaddtype/numpy_quaddtype/src/casts.cpp

@@ -904,4 +904,4 @@ free_casts(void)
         }
     }
     spec_count = 0;
-}
+}

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;
-}
+}

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
+#endif