Skip to content

Commit 9c67e56

Browse files
committed
1 parent 8b9eb96 commit 9c67e56

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/pybind11/numpy.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ struct npy_api {
181181
unsigned int (*PyArray_GetNDArrayCFeatureVersion_)();
182182
PyObject *(*PyArray_DescrFromType_)(int);
183183
PyObject *(*PyArray_NewFromDescr_)
184-
(PyTypeObject *, PyObject *, int, Py_intptr_t *,
185-
Py_intptr_t *, void *, int, PyObject *);
184+
(PyTypeObject *, PyObject *, int, Py_intptr_t const *,
185+
Py_intptr_t const *, void *, int, PyObject *);
186186
PyObject *(*PyArray_DescrNewFromType_)(int);
187187
int (*PyArray_CopyInto_)(PyObject *, PyObject *);
188188
PyObject *(*PyArray_NewCopy_)(PyObject *, int);
@@ -193,8 +193,8 @@ struct npy_api {
193193
PyObject *(*PyArray_FromAny_) (PyObject *, PyObject *, int, int, int, PyObject *);
194194
int (*PyArray_DescrConverter_) (PyObject *, PyObject **);
195195
bool (*PyArray_EquivTypes_) (PyObject *, PyObject *);
196-
int (*PyArray_GetArrayParamsFromObject_)(PyObject *, PyObject *, char, PyObject **, int *,
197-
Py_ssize_t *, PyObject **, PyObject *);
196+
int (*PyArray_GetArrayParamsFromObject_)(PyObject *, PyObject *, unsigned char, PyObject **, int *,
197+
Py_intptr_t *, PyObject **, PyObject *);
198198
PyObject *(*PyArray_Squeeze_)(PyObject *);
199199
int (*PyArray_SetBaseObject_)(PyObject *, PyObject *);
200200
PyObject* (*PyArray_Resize_)(PyObject*, PyArray_Dims*, int, int);
@@ -211,7 +211,7 @@ struct npy_api {
211211
API_PyArray_CopyInto = 82,
212212
API_PyArray_NewCopy = 85,
213213
API_PyArray_NewFromDescr = 94,
214-
API_PyArray_DescrNewFromType = 9,
214+
API_PyArray_DescrNewFromType = 96,
215215
API_PyArray_DescrConverter = 174,
216216
API_PyArray_EquivTypes = 182,
217217
API_PyArray_GetArrayParamsFromObject = 278,
@@ -866,7 +866,7 @@ template <typename T, int ExtraFlags = array::forcecast> class array_t : public
866866
ExtraFlags & f_style ? f_strides(*shape, itemsize()) : c_strides(*shape, itemsize()),
867867
ptr, base) { }
868868

869-
explicit array_t(size_t count, const T *ptr = nullptr, handle base = handle())
869+
explicit array_t(ssize_t count, const T *ptr = nullptr, handle base = handle())
870870
: array({count}, {}, ptr, base) { }
871871

872872
constexpr ssize_t itemsize() const {

0 commit comments

Comments
 (0)