diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2022-06-14 11:48:48 -0700 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2022-06-15 11:42:02 -0700 |
| commit | b96e43fa42e0583e13086e2576e872bb08d9d397 (patch) | |
| tree | b7b19488de22675ada02a6c02c7ce5b8f0d4bfa9 | |
| parent | 5f8f18c7931054d7258e38d35b0f765208ef3014 (diff) | |
| download | numpy-b96e43fa42e0583e13086e2576e872bb08d9d397.tar.gz | |
MAINT: Fixup bad rebase
| -rw-r--r-- | numpy/core/src/multiarray/convert_datatype.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.h b/numpy/core/src/multiarray/convert_datatype.h index f5951e8f0..b6bc7d8a7 100644 --- a/numpy/core/src/multiarray/convert_datatype.h +++ b/numpy/core/src/multiarray/convert_datatype.h @@ -51,15 +51,12 @@ PyArray_ValidType(int type); NPY_NO_EXPORT int dtype_kind_to_ordering(char kind); -NPY_NO_EXPORT npy_bool -can_cast_scalar_to(PyArray_Descr *scal_type, char *scal_data, - PyArray_Descr *to, NPY_CASTING casting); - /* Used by PyArray_CanCastArrayTo and in the legacy ufunc type resolution */ NPY_NO_EXPORT npy_bool can_cast_scalar_to(PyArray_Descr *scal_type, char *scal_data, PyArray_Descr *to, NPY_CASTING casting); +NPY_NO_EXPORT npy_bool can_cast_pyscalar_scalar_to( int flags, PyArray_Descr *to, NPY_CASTING casting); |