Mercurial > hg > octave-max

changeset 5771:9c7be8e14b5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-04-18 19:17:33 by jwe]
author jwe
date Tue, 18 Apr 2006 19:17:33 +0000
parents 6a9244f89a2a
children 405566d2a353
files src/ChangeLog src/DLD-FUNCTIONS/ccolamd.cc
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-18  John W. Eaton  <jwe@octave.org>
 
+	* DLD-FUNCTIONS/ccolamd.cc (Fccolamd, Fcsymamd):	
+	Always return something.
+
 	* sighandlers.cc (octave_set_signal_handler,
 	octave_set_interrupt_handler): New arg, restart_syscalls, with
 	default value true.
--- a/src/DLD-FUNCTIONS/ccolamd.cc
+++ b/src/DLD-FUNCTIONS/ccolamd.cc
@@ -134,8 +134,10 @@
 @seealso{colamd, csymamd}\n\
 @end deftypefn")
 {
+  octave_value_list retval;
+
 #ifdef HAVE_CCOLAMD
-  octave_value_list retval;
+
   int nargin = args.length ();
   int spumoni = 0;
  
@@ -316,12 +318,13 @@
 	}
     }
 
-  return retval;
 #else
 
   error ("ccolamd: not available in this version of Octave");
 
 #endif
+
+  return retval;
 }
 
 DEFUN_DLD (csymamd, args, nargout,
@@ -386,8 +389,10 @@
 @seealso{symamd, ccolamd}\n\
 @end deftypefn")
 {
+  octave_value_list retval;
+
 #if HAVE_CCOLAMD
-  octave_value_list retval;
+
   int nargin = args.length ();
   int spumoni = 0;
  
@@ -563,12 +568,13 @@
 	}
     }
 
-  return retval;
 #else
 
   error ("csymamd: not available in this version of Octave");
 
 #endif
+
+  return retval;
 }
 
 /*