changeset 6060:ced23ae2b5cc

[project @ 2006-10-18 02:56:22 by jwe]
author jwe
date Wed, 18 Oct 2006 02:56:54 +0000
parents 8fd77759707c
children c968f4198067
files liboctave/CMatrix.cc liboctave/CSparse.cc liboctave/oct-syscalls.cc
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CMatrix.cc	Wed Oct 18 02:21:22 2006 +0000
+++ b/liboctave/CMatrix.cc	Wed Oct 18 02:56:54 2006 +0000
@@ -2170,7 +2170,7 @@
 		      solve_singularity_handler sing_handler) const
 {
   MatrixType mattype (*this);
-  return solve (b, info, rcond, sing_handler);
+  return solve (mattype, b, info, rcond, sing_handler);
 }
 
 ComplexColumnVector
--- a/liboctave/CSparse.cc	Wed Oct 18 02:21:22 2006 +0000
+++ b/liboctave/CSparse.cc	Wed Oct 18 02:56:54 2006 +0000
@@ -505,7 +505,7 @@
 SparseComplexMatrix::insert (const SparseMatrix& a, octave_idx_type r, octave_idx_type c)
 {
   SparseComplexMatrix tmp (a);
-  return insert (a, r, c);
+  return insert (tmp /*a*/, r, c);
 }
 
 SparseComplexMatrix&
--- a/liboctave/oct-syscalls.cc	Wed Oct 18 02:21:22 2006 +0000
+++ b/liboctave/oct-syscalls.cc	Wed Oct 18 02:56:54 2006 +0000
@@ -309,10 +309,11 @@
 octave_syscalls::waitpid (pid_t pid, int *status, int options,
 			  std::string& msg)
 {
+  pid_t retval = -1;
   msg = std::string ();
 
 #if defined (HAVE_WAITPID)
-  pid_t retval = ::octave_waitpid (pid, status, options);
+  retval = ::octave_waitpid (pid, status, options);
 
   if (retval < 0)
     {