Skip to content

Commit 3f94fee

Browse files
committed
adapt to change in resolve_descriptors_function signature
1 parent 254696b commit 3f94fee

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

stringdtype/stringdtype/src/umath.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ string_equal_strided_loop(PyArrayMethod_Context *context, char *const data[],
4848
}
4949

5050
static NPY_CASTING
51-
string_equal_resolve_descriptors(PyObject *NPY_UNUSED(self),
52-
PyArray_DTypeMeta *NPY_UNUSED(dtypes[]),
53-
PyArray_Descr *given_descrs[],
54-
PyArray_Descr *loop_descrs[],
55-
npy_intp *NPY_UNUSED(view_offset))
51+
string_equal_resolve_descriptors(
52+
struct PyArrayMethodObject_tag *NPY_UNUSED(method),
53+
PyArray_DTypeMeta *NPY_UNUSED(dtypes[]), PyArray_Descr *given_descrs[],
54+
PyArray_Descr *loop_descrs[], npy_intp *NPY_UNUSED(view_offset))
5655
{
5756
Py_INCREF(given_descrs[0]);
5857
loop_descrs[0] = given_descrs[0];
@@ -86,11 +85,10 @@ string_isnan_strided_loop(PyArrayMethod_Context *NPY_UNUSED(context),
8685
}
8786

8887
static NPY_CASTING
89-
string_isnan_resolve_descriptors(PyObject *NPY_UNUSED(self),
90-
PyArray_DTypeMeta *NPY_UNUSED(dtypes[]),
91-
PyArray_Descr *given_descrs[],
92-
PyArray_Descr *loop_descrs[],
93-
npy_intp *NPY_UNUSED(view_offset))
88+
string_isnan_resolve_descriptors(
89+
struct PyArrayMethodObject_tag *NPY_UNUSED(method),
90+
PyArray_DTypeMeta *NPY_UNUSED(dtypes[]), PyArray_Descr *given_descrs[],
91+
PyArray_Descr *loop_descrs[], npy_intp *NPY_UNUSED(view_offset))
9492
{
9593
Py_INCREF(given_descrs[0]);
9694
loop_descrs[0] = given_descrs[0];
@@ -176,9 +174,6 @@ init_ufunc(PyObject *numpy, const char *ufunc_name, PyArray_DTypeMeta **dtypes,
176174
return -1;
177175
}
178176

179-
/*
180-
* Initialize spec for equality
181-
*/
182177
PyType_Slot slots[] = {{NPY_METH_resolve_descriptors, resolve_func},
183178
{NPY_METH_strided_loop, loop_func},
184179
{0, NULL}};

0 commit comments

Comments
 (0)