[Boost-commit] svn:boost r64119 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack/auxiliary boost/numeric/bindings/lapack/detail libs/numeric/bindings/tools libs/numeric/bindings/tools/templates

Subject: [Boost-commit] svn:boost r64119 - in sandbox/numeric_bindings: boost/numeric/bindings/lapack/auxiliary boost/numeric/bindings/lapack/detail libs/numeric/bindings/tools libs/numeric/bindings/tools/templates
From: thomas.klimpel_at_[hidden]
Date: 2010-07-18 06:17:21

Author: klimpel
Date: 2010-07-18 06:17:19 EDT (Sun, 18 Jul 2010)
New Revision: 64119
URL: http://svn.boost.org/trac/boost/changeset/64119

Log:
use fortran_int_t also in ilaenv.hpp instead of int
Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/auxiliary/ilaenv.hpp         |    25 +++++++++++--------------               
   sandbox/numeric_bindings/boost/numeric/bindings/lapack/detail/lapack.h              |     6 ++++--                                  
   sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py                    |     1 +                                       
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/singleton_lapack.hpp |     6 ++++--                                  
   4 files changed, 20 insertions(+), 18 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/auxiliary/ilaenv.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/auxiliary/ilaenv.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/auxiliary/ilaenv.hpp	2010-07-18 06:17:19 EDT (Sun, 18 Jul 2010)
@@ -19,21 +19,18 @@
 
 namespace boost { namespace numeric { namespace bindings { namespace lapack {
 
-  /*
-   * ilaenv() is called from the LAPACK routines to choose  
-   * problem-dependent parameters such as the block sizes 
-   * for the local environment.
-   */
+//
+// ilaenv() is called from the LAPACK routines to choose  
+// problem-dependent parameters such as the block sizes 
+// for the local environment.
+//
   
-  inline
-  int ilaenv (int const ispec, const char* name, const char* opts,
-              int const n1 = -1, int const n2 = -1, 
-              int const n3 = -1, int const n4 = -1)
-  {
-    return ::LAPACK_ILAENV (&ispec, name, opts, &n1, &n2, &n3, &n4,
-                          std::strlen (name), std::strlen (opts));
-  }
-
+inline std::ptrdiff_t ilaenv( const fortran_int_t ispec, const char* name,
+        const char* opts, const fortran_int_t n1 = -1, const fortran_int_t n2 = -1,
+        const fortran_int_t n3 = -1, const fortran_int_t n4 = -1) {
+    return LAPACK_ILAENV( &ispec, name, opts, &n1, &n2, &n3, &n4,
+                          std::strlen (name), std::strlen (opts) );
+}
 
 }}}}
 

Modified: sandbox/numeric_bindings/boost/numeric/bindings/lapack/detail/lapack.h
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/lapack/detail/lapack.h	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/lapack/detail/lapack.h	2010-07-18 06:17:19 EDT (Sun, 18 Jul 2010)
@@ -4352,8 +4352,10 @@
 // LAPACK auxiliary routines
 //
 
-int LAPACK_ILAENV(int const* ispec, const char* name, const char* opt,
-    int const* n1, int const* n2, int const* n3, int const* n4, int, int);
+fortran_int_t LAPACK_ILAENV(const fortran_int_t* ispec, const char* name,
+        const char* opt, const fortran_int_t* n1, const fortran_int_t* n2,
+        const fortran_int_t* n3, const fortran_int_t* n4, fortran_int_t,
+        fortran_int_t);
 
 }
 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/bindings.py	2010-07-18 06:17:19 EDT (Sun, 18 Jul 2010)
@@ -215,6 +215,7 @@
 
   result = template_map[ parsermode + '.h' ]
   result = result.replace( "$CONTENT", content )
+  result = result.replace( "$LIBRARY_INT_TYPE", "fortran_int_t" )
   #result = result.replace( "$PARSERMODE", template_map[ "PARSERMODE" ] )
 
   open( dest_file, 'w' ).write( result )

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/singleton_lapack.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/singleton_lapack.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/singleton_lapack.hpp	2010-07-18 06:17:19 EDT (Sun, 18 Jul 2010)
@@ -28,8 +28,10 @@
 // LAPACK auxiliary routines
 //
 
-int LAPACK_ILAENV(int const* ispec, const char* name, const char* opt,
-    int const* n1, int const* n2, int const* n3, int const* n4, int, int);
+$LIBRARY_INT_TYPE LAPACK_ILAENV(const $LIBRARY_INT_TYPE* ispec, const char* name,
+        const char* opt, const $LIBRARY_INT_TYPE* n1, const $LIBRARY_INT_TYPE* n2,
+        const $LIBRARY_INT_TYPE* n3, const $LIBRARY_INT_TYPE* n4, $LIBRARY_INT_TYPE,
+        $LIBRARY_INT_TYPE);
 
 }