From 20ec480ff8979fce00ab076ef74893815bf88f4e Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Mon, 15 Feb 2010 23:13:16 +0000 Subject: API and ABI changes: Removed BigArrayType, Fixed hasobject to an integer (and inserted an unused character for alignment) and renamed it to flags. Re-organized the ArrFuncs structure. Moved NPY_DATETIME and friends to their 'correct' place in the type order. --- doc/numpybook/capi.lyx | 16 ++++++++++++---- doc/numpybook/comparison/pyrex/c_numpy.pxd | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'doc/numpybook') diff --git a/doc/numpybook/capi.lyx b/doc/numpybook/capi.lyx index 04522d13d..72f18ca31 100644 --- a/doc/numpybook/capi.lyx +++ b/doc/numpybook/capi.lyx @@ -599,7 +599,15 @@ char \emph on char \emph default - hasobject; + unused; +\end_layout + +\begin_layout LyX-Code + +\emph on +int +\emph default + flags; \end_layout \begin_layout LyX-Code @@ -674,9 +682,9 @@ NPY_USE_SETITEM \family default flags should be set in the \family typewriter -hasobject +flags \family default - flag. + member. \end_layout \begin_layout Description @@ -702,7 +710,7 @@ ndian), '=' (native), '|' (irrelevant, ignore). \end_layout \begin_layout Description -hasobject A data-type bit-flag that determines if the data-type exhibits +flags A data-type bit-flag that determines if the data-type exhibits object-array like behavior. Each bit in this member is a flag which are named as: \end_layout diff --git a/doc/numpybook/comparison/pyrex/c_numpy.pxd b/doc/numpybook/comparison/pyrex/c_numpy.pxd index e772f6fee..66e77e294 100644 --- a/doc/numpybook/comparison/pyrex/c_numpy.pxd +++ b/doc/numpybook/comparison/pyrex/c_numpy.pxd @@ -73,7 +73,8 @@ cdef extern from "numpy/arrayobject.h": ctypedef extern class numpy.dtype [object PyArray_Descr]: cdef int type_num, elsize, alignment - cdef char type, kind, byteorder, hasobject + cdef char type, kind, byteorder + cdef int flags cdef object fields, typeobj ctypedef extern class numpy.ndarray [object PyArrayObject]: -- cgit v1.2.1