[Numpy-svn] r4500 - trunk/numpy/doc/swig

numpy-svn@scip... numpy-svn@scip...
Fri Nov 23 20:20:01 CST 2007


Author: wfspotz@sandia.gov
Date: 2007-11-23 20:19:50 -0600 (Fri, 23 Nov 2007)
New Revision: 4500

Modified:
   trunk/numpy/doc/swig/numpy.i
   trunk/numpy/doc/swig/pyfragments.swg
Log:
Added min and max macros to Backward Compatibility fragments

Modified: trunk/numpy/doc/swig/numpy.i
===================================================================
--- trunk/numpy/doc/swig/numpy.i	2007-11-24 02:04:19 UTC (rev 4499)
+++ trunk/numpy/doc/swig/numpy.i	2007-11-24 02:19:50 UTC (rev 4500)
@@ -24,32 +24,50 @@
 /* Support older NumPy data type names
 */
 %#if NDARRAY_VERSION < 0x01000000
-%#define NPY_BOOL        PyArray_BOOL
-%#define NPY_BYTE        PyArray_BYTE
-%#define NPY_UBYTE       PyArray_UBYTE
-%#define NPY_SHORT       PyArray_SHORT
-%#define NPY_USHORT      PyArray_USHORT
-%#define NPY_INT         PyArray_INT
-%#define NPY_UINT        PyArray_UINT
-%#define NPY_LONG        PyArray_LONG
-%#define NPY_ULONG       PyArray_ULONG
-%#define NPY_LONGLONG    PyArray_LONGLONG
-%#define NPY_ULONGLONG   PyArray_ULONGLONG
-%#define NPY_FLOAT       PyArray_FLOAT
-%#define NPY_DOUBLE      PyArray_DOUBLE
-%#define NPY_LONGDOUBLE  PyArray_LONGDOUBLE
-%#define NPY_CFLOAT      PyArray_CFLOAT
-%#define NPY_CDOUBLE     PyArray_CDOUBLE
-%#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
-%#define NPY_OBJECT      PyArray_OBJECT
-%#define NPY_STRING      PyArray_STRING
-%#define NPY_UNICODE     PyArray_UNICODE
-%#define NPY_VOID        PyArray_VOID
-%#define NPY_NTYPES      PyArray_NTYPES
-%#define NPY_NOTYPE      PyArray_NOTYPE
-%#define NPY_CHAR        PyArray_CHAR
-%#define NPY_USERDEF     PyArray_USERDEF
-%#define npy_intp        intp
+%#define NPY_BOOL          PyArray_BOOL
+%#define NPY_BYTE          PyArray_BYTE
+%#define NPY_UBYTE         PyArray_UBYTE
+%#define NPY_SHORT         PyArray_SHORT
+%#define NPY_USHORT        PyArray_USHORT
+%#define NPY_INT           PyArray_INT
+%#define NPY_UINT          PyArray_UINT
+%#define NPY_LONG          PyArray_LONG
+%#define NPY_ULONG         PyArray_ULONG
+%#define NPY_LONGLONG      PyArray_LONGLONG
+%#define NPY_ULONGLONG     PyArray_ULONGLONG
+%#define NPY_FLOAT         PyArray_FLOAT
+%#define NPY_DOUBLE        PyArray_DOUBLE
+%#define NPY_LONGDOUBLE    PyArray_LONGDOUBLE
+%#define NPY_CFLOAT        PyArray_CFLOAT
+%#define NPY_CDOUBLE       PyArray_CDOUBLE
+%#define NPY_CLONGDOUBLE   PyArray_CLONGDOUBLE
+%#define NPY_OBJECT        PyArray_OBJECT
+%#define NPY_STRING        PyArray_STRING
+%#define NPY_UNICODE       PyArray_UNICODE
+%#define NPY_VOID          PyArray_VOID
+%#define NPY_NTYPES        PyArray_NTYPES
+%#define NPY_NOTYPE        PyArray_NOTYPE
+%#define NPY_CHAR          PyArray_CHAR
+%#define NPY_USERDEF       PyArray_USERDEF
+%#define npy_intp          intp
+
+%#define NPY_MAX_BYTE      MAX_BYTE
+%#define NPY_MIN_BYTE      MIN_BYTE
+%#define NPY_MAX_UBYTE     MAX_UBYTE
+%#define NPY_MAX_SHORT     MAX_SHORT
+%#define NPY_MIN_SHORT     MIN_SHORT
+%#define NPY_MAX_USHORT    MAX_USHORT
+%#define NPY_MAX_INT       MAX_INT
+%#define NPY_MIN_INT       MIN_INT
+%#define NPY_MAX_UINT      MAX_UINT
+%#define NPY_MAX_LONG      MAX_LONG
+%#define NPY_MIN_LONG      MIN_LONG
+%#define NPY_MAX_ULONG     MAX_ULONG
+%#define NPY_MAX_LONGLONG  MAX_LONGLONG
+%#define NPY_MIN_LONGLONG  MIN_LONGLONG
+%#define NPY_MAX_ULONGLONG MAX_ULONGLONG
+%#define NPY_MAX_INTP      MAX_INTP
+%#define NPY_MIN_INTP      MIN_INTP
 %#endif
 }
 

Modified: trunk/numpy/doc/swig/pyfragments.swg
===================================================================
--- trunk/numpy/doc/swig/pyfragments.swg	2007-11-24 02:04:19 UTC (rev 4499)
+++ trunk/numpy/doc/swig/pyfragments.swg	2007-11-24 02:19:50 UTC (rev 4500)
@@ -11,32 +11,50 @@
 /* Support older NumPy data type names
  */
 %#if NDARRAY_VERSION < 0x01000000
-%#define NPY_BOOL        PyArray_BOOL
-%#define NPY_BYTE        PyArray_BYTE
-%#define NPY_UBYTE       PyArray_UBYTE
-%#define NPY_SHORT       PyArray_SHORT
-%#define NPY_USHORT      PyArray_USHORT
-%#define NPY_INT         PyArray_INT
-%#define NPY_UINT        PyArray_UINT
-%#define NPY_LONG        PyArray_LONG
-%#define NPY_ULONG       PyArray_ULONG
-%#define NPY_LONGLONG    PyArray_LONGLONG
-%#define NPY_ULONGLONG   PyArray_ULONGLONG
-%#define NPY_FLOAT       PyArray_FLOAT
-%#define NPY_DOUBLE      PyArray_DOUBLE
-%#define NPY_LONGDOUBLE  PyArray_LONGDOUBLE
-%#define NPY_CFLOAT      PyArray_CFLOAT
-%#define NPY_CDOUBLE     PyArray_CDOUBLE
-%#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
-%#define NPY_OBJECT      PyArray_OBJECT
-%#define NPY_STRING      PyArray_STRING
-%#define NPY_UNICODE     PyArray_UNICODE
-%#define NPY_VOID        PyArray_VOID
-%#define NPY_NTYPES      PyArray_NTYPES
-%#define NPY_NOTYPE      PyArray_NOTYPE
-%#define NPY_CHAR        PyArray_CHAR
-%#define NPY_USERDEF     PyArray_USERDEF
-%#define npy_intp        intp
+%#define NPY_BOOL          PyArray_BOOL
+%#define NPY_BYTE          PyArray_BYTE
+%#define NPY_UBYTE         PyArray_UBYTE
+%#define NPY_SHORT         PyArray_SHORT
+%#define NPY_USHORT        PyArray_USHORT
+%#define NPY_INT           PyArray_INT
+%#define NPY_UINT          PyArray_UINT
+%#define NPY_LONG          PyArray_LONG
+%#define NPY_ULONG         PyArray_ULONG
+%#define NPY_LONGLONG      PyArray_LONGLONG
+%#define NPY_ULONGLONG     PyArray_ULONGLONG
+%#define NPY_FLOAT         PyArray_FLOAT
+%#define NPY_DOUBLE        PyArray_DOUBLE
+%#define NPY_LONGDOUBLE    PyArray_LONGDOUBLE
+%#define NPY_CFLOAT        PyArray_CFLOAT
+%#define NPY_CDOUBLE       PyArray_CDOUBLE
+%#define NPY_CLONGDOUBLE   PyArray_CLONGDOUBLE
+%#define NPY_OBJECT        PyArray_OBJECT
+%#define NPY_STRING        PyArray_STRING
+%#define NPY_UNICODE       PyArray_UNICODE
+%#define NPY_VOID          PyArray_VOID
+%#define NPY_NTYPES        PyArray_NTYPES
+%#define NPY_NOTYPE        PyArray_NOTYPE
+%#define NPY_CHAR          PyArray_CHAR
+%#define NPY_USERDEF       PyArray_USERDEF
+%#define npy_intp          intp
+
+%#define NPY_MAX_BYTE      MAX_BYTE
+%#define NPY_MIN_BYTE      MIN_BYTE
+%#define NPY_MAX_UBYTE     MAX_UBYTE
+%#define NPY_MAX_SHORT     MAX_SHORT
+%#define NPY_MIN_SHORT     MIN_SHORT
+%#define NPY_MAX_USHORT    MAX_USHORT
+%#define NPY_MAX_INT       MAX_INT
+%#define NPY_MIN_INT       MIN_INT
+%#define NPY_MAX_UINT      MAX_UINT
+%#define NPY_MAX_LONG      MAX_LONG
+%#define NPY_MIN_LONG      MIN_LONG
+%#define NPY_MAX_ULONG     MAX_ULONG
+%#define NPY_MAX_LONGLONG  MAX_LONGLONG
+%#define NPY_MIN_LONGLONG  MIN_LONGLONG
+%#define NPY_MAX_ULONGLONG MAX_ULONGLONG
+%#define NPY_MAX_INTP      MAX_INTP
+%#define NPY_MIN_INTP      MIN_INTP
 %#endif
 }
 



More information about the Numpy-svn mailing list