diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-04-30 08:37:38 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-04-30 08:37:38 +0000 |
| commit | 2c1ac5440c3ab4d673498124c0e7608c4b3c5c1c (patch) | |
| tree | 1ee20acd441a61b828e0334314a514f0925b3195 /numpy/core/src/arrayobject.c | |
| parent | 98389353b020db90e90e00da4bdf19e18f942cba (diff) | |
| download | numpy-2c1ac5440c3ab4d673498124c0e7608c4b3c5c1c.tar.gz | |
Put array methods in separate file.
Diffstat (limited to 'numpy/core/src/arrayobject.c')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index c141314ac..f15111707 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -31,11 +31,15 @@ maintainer email: oliphant.travis@ieee.org #include "numpy/arrayscalars.h" #include "arrayobject.h" +#include "arraymethods.h" #include "arraydescr.h" #include "arrayiterators.h" #include "arraymapping.h" #include "arraygetset.h" #include "arraysequence.h" + +static PyArray_Descr * _array_typedescr_fromstr(char *); + #ifndef Py_UNICODE_WIDE #include "ucsnarrow.h" #endif @@ -3087,8 +3091,6 @@ PyArray_CheckAxis(PyArrayObject *arr, int *axis, int flags) #define _check_axis PyArray_CheckAxis -#include "arraymethods.c" - /* Lifted from numarray */ /*NUMPY_API PyArray_IntTupleFromIntp @@ -3269,7 +3271,7 @@ _IsFortranContiguous(PyArrayObject *ap) return 1; } -static int +NPY_NO_EXPORT int _IsAligned(PyArrayObject *ap) { int i, alignment, aligned = 1; @@ -3291,7 +3293,7 @@ _IsAligned(PyArrayObject *ap) return aligned != 0; } -static Bool +NPY_NO_EXPORT Bool _IsWriteable(PyArrayObject *ap) { PyObject *base=ap->base; @@ -3462,7 +3464,7 @@ PyArray_CheckStrides(int elsize, int nd, intp numbytes, intp offset, * array is desired. */ -static size_t +NPY_NO_EXPORT size_t _array_fill_strides(intp *strides, intp *dims, int nd, size_t itemsize, int inflag, int *objflags) { |