Commit 786e1e9e authored by Robert Bradshaw's avatar Robert Bradshaw

Merge pull request #239 from bgrant/patch-1

PyArray_FROM_OTF and PyArray_FROM_OT should return type `object`
parents ab7c282b 9e5c8197
......@@ -488,8 +488,8 @@ cdef extern from "numpy/arrayobject.h":
object PyArray_FROM_O(object)
object PyArray_FROM_OF(object m, int flags)
bint PyArray_FROM_OT(object m, int type)
bint PyArray_FROM_OTF(object m, int type, int flags)
object PyArray_FROM_OT(object m, int type)
object PyArray_FROM_OTF(object m, int type, int flags)
object PyArray_FROMANY(object m, int type, int min, int max, int flags)
object PyArray_ZEROS(int nd, npy_intp* dims, int type, int fortran)
object PyArray_EMPTY(int nd, npy_intp* dims, int type, int fortran)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment