Mercurial > hg > octave-lyh

changeset 7478:d7c5b101bb0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ilaenv --> xilaenv
author John W. Eaton <jwe@octave.org>
date Tue, 12 Feb 2008 23:45:20 -0500
parents 8b22207ef9ca
children 3018354c554c
files libcruft/ChangeLog libcruft/lapack-xtra/Makefile.in liboctave/CMatrix.cc liboctave/dMatrix.cc
diffstat 4 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,6 +1,7 @@
 2008-02-12  John W. Eaton  <jwe@octave.org>
 
 	* lapack-xtra/xilaenv.f: New wrapper for Fortran function ilaenv.
+	* lapack-xtra/Makefile.in (FSRC): Add it to the list.
 
 2008-02-06  John W. Eaton  <jwe@octave.org>
 
--- a/libcruft/lapack-xtra/Makefile.in
+++ b/libcruft/lapack-xtra/Makefile.in
@@ -26,7 +26,7 @@
 
 EXTERNAL_DISTFILES = $(DISTFILES)
 
-FSRC = xdlamch.f xdlange.f xzlange.f
+FSRC = xdlamch.f xdlange.f xilaenv.f xzlange.f
 
 include $(TOPDIR)/Makeconf
 
--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -67,9 +67,9 @@
   F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
 			       F77_CONST_CHAR_ARG_DECL,
 			       const octave_idx_type&, const octave_idx_type&,
-			       const octave_idx_type&, const octave_idx_type&
-			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL,
-			       octave_idx_type&);
+			       const octave_idx_type&, const octave_idx_type&,
+			       octave_idx_type&
+			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL);
 
   F77_RET_T
   F77_FUNC (zgebal, ZGEBAL) (F77_CONST_CHAR_ARG_DECL,
@@ -2503,9 +2503,9 @@
       octave_idx_type smlsiz;
       F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("ZGELSD", 6),
 				   F77_CONST_CHAR_ARG2 (" ", 1),
-				   0, 0, 0, 0
+				   0, 0, 0, 0, smlsiz
 				   F77_CHAR_ARG_LEN (6)
-				   F77_CHAR_ARG_LEN (1), smlsiz);
+				   F77_CHAR_ARG_LEN (1));
 
       // We compute the size of rwork and iwork because ZGELSD in
       // older versions of LAPACK does not return them on a query
--- a/liboctave/dMatrix.cc
+++ b/liboctave/dMatrix.cc
@@ -59,13 +59,13 @@
 
 extern "C"
 {
-  octave_idx_type
+  F77_RET_T
   F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL,
 			       F77_CONST_CHAR_ARG_DECL,
 			       const octave_idx_type&, const octave_idx_type&,
-			       const octave_idx_type&, const octave_idx_type&
-			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL,
-			       octave_idx_type&);
+			       const octave_idx_type&, const octave_idx_type&,
+			       octave_idx_type&
+			       F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL);
 
   F77_RET_T
   F77_FUNC (dgebal, DGEBAL) (F77_CONST_CHAR_ARG_DECL,
@@ -2114,9 +2114,9 @@
       octave_idx_type smlsiz;
       F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("DGELSD", 6),
 				   F77_CONST_CHAR_ARG2 (" ", 1),
-				   0, 0, 0, 0
+				   0, 0, 0, 0, smlsiz
 				   F77_CHAR_ARG_LEN (6)
-				   F77_CHAR_ARG_LEN (1), smlsiz);
+				   F77_CHAR_ARG_LEN (1));
 
       // We compute the size of iwork because DGELSD in older versions
       // of LAPACK does not return it on a query call.