diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-09-09 09:19:36 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-09-09 09:19:36 -0700 |
| commit | b768db806ea09c2d7cf1561cc065e74989469e98 (patch) | |
| tree | b84f38e3d1cdd5c1fa0503e12abac2d7026c1010 | |
| parent | c9b06111227f7a4ec213571f97e1b8d19b9c23f5 (diff) | |
| parent | 8233626b3b27a911e840dc3a585c71eab52756b4 (diff) | |
| download | numpy-b768db806ea09c2d7cf1561cc065e74989469e98.tar.gz | |
Merge pull request #3709 from charris/update-conversion_utils_h
BUG: PyArray_SelectkindConverter should be in conversion_utils.h.
| -rw-r--r-- | numpy/core/src/multiarray/conversion_utils.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/conversion_utils.h b/numpy/core/src/multiarray/conversion_utils.h index cc16cd9c7..59d3120a4 100644 --- a/numpy/core/src/multiarray/conversion_utils.h +++ b/numpy/core/src/multiarray/conversion_utils.h @@ -1,6 +1,8 @@ #ifndef _NPY_PRIVATE_CONVERSION_UTILS_H_ #define _NPY_PRIVATE_CONVERSION_UTILS_H_ +#include <numpy/ndarraytypes.h> + NPY_NO_EXPORT int PyArray_IntpConverter(PyObject *obj, PyArray_Dims *seq); @@ -37,6 +39,9 @@ PyArray_TypestrConvert(int itemsize, int gentype); NPY_NO_EXPORT PyObject * PyArray_IntTupleFromIntp(int len, npy_intp *vals); +NPY_NO_EXPORT int +PyArray_SelectkindConverter(PyObject *obj, NPY_SELECTKIND *selectkind); + /* * Converts an axis parameter into an ndim-length C-array of * boolean flags, True for each axis specified. |