[Scipy-svn] r2605 - trunk/Lib/linsolve/umfpack

scipy-svn at scipy.org scipy-svn at scipy.org
Wed Jan 24 05:35:01 CST 2007


Author: rc
Date: 2007-01-24 05:34:56 -0600 (Wed, 24 Jan 2007)
New Revision: 2605

Modified:
   trunk/Lib/linsolve/umfpack/umfpack.i
Log:
update for SWIG > 1.3.29

Modified: trunk/Lib/linsolve/umfpack/umfpack.i
===================================================================
--- trunk/Lib/linsolve/umfpack/umfpack.i	2007-01-24 09:35:02 UTC (rev 2604)
+++ trunk/Lib/linsolve/umfpack/umfpack.i	2007-01-24 11:34:56 UTC (rev 2605)
@@ -1,3 +1,6 @@
+/* -*- C -*- */
+#ifdef SWIGPYTHON
+
 %module _umfpack
 
 /*
@@ -91,7 +94,7 @@
   - 30.11.2005, c
 */
 #define ARRAY_IN( rtype, ctype, atype ) \
-%typemap( python, in ) (ctype *array) { \
+%typemap( in ) (ctype *array) { \
   PyArrayObject *obj; \
   obj = helper_getCArrayObject( $input, PyArray_##atype, 1, 1 ); \
   if (!obj) return NULL; \
@@ -104,7 +107,7 @@
   - 30.11.2005, c
 */
 #define CONF_IN( arSize ) \
-%typemap( python, in ) (double conf [arSize]) { \
+%typemap( in ) (double conf [arSize]) { \
   PyArrayObject *obj; \
   obj = helper_getCArrayObject( $input, PyArray_DOUBLE, 1, 1 ); \
   if (!obj) return NULL; \
@@ -122,10 +125,10 @@
   - 02.12.2005
 */
 #define OPAQUE_ARGOUT( ttype ) \
-%typemap( python, in, numinputs=0 ) ttype* opaque_argout( ttype tmp ) { \
+%typemap( in, numinputs=0 ) ttype* opaque_argout( ttype tmp ) { \
   $1 = &tmp; \
 }; \
-%typemap( python, argout ) ttype* opaque_argout { \
+%typemap( argout ) ttype* opaque_argout { \
   PyObject *obj; \
   obj = SWIG_NewPointerObj( (ttype) (*$1), $*1_descriptor, 1 ); \
   $result = helper_appendToTuple( $result, obj ); \
@@ -136,12 +139,12 @@
   - 02.12.2005, c
 */
 #define OPAQUE_ARGINOUT( ttype ) \
-%typemap( python, in ) ttype* opaque_arginout( ttype tmp ) { \
+%typemap( in ) ttype* opaque_arginout( ttype tmp ) { \
   if ((SWIG_ConvertPtr( $input,(void **) &tmp, $*1_descriptor, \
 			SWIG_POINTER_EXCEPTION)) == -1) return NULL; \
   $1 = &tmp; \
 }; \
-%typemap( python, argout ) ttype* opaque_arginout { \
+%typemap( argout ) ttype* opaque_arginout { \
   PyObject *obj; \
   obj = SWIG_NewPointerObj( (ttype) (*$1), $*1_descriptor, 1 ); \
   $result = helper_appendToTuple( $result, obj ); \
@@ -266,3 +269,5 @@
 };
 %apply int  *OUTPUT { int *do_recip};
 %include <umfpack_get_numeric.h>
+
+#endif



More information about the Scipy-svn mailing list