Mercurial > octave
diff libinterp/dldfcn/colamd.cc @ 20898:8da80da1ac37
maint: Use ovl() more places in the code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 14 Dec 2015 17:53:27 -0800 |
| parents | ac1f8c640d8f |
| children | 03e4ddd49396 |
line wrap: on
line diff
--- a/libinterp/dldfcn/colamd.cc Mon Dec 14 15:34:39 2015 -0800 +++ b/libinterp/dldfcn/colamd.cc Mon Dec 14 17:53:27 2015 -0800 @@ -278,17 +278,14 @@ @seealso{colperm, symamd, ccolamd}\n\ @end deftypefn") { - octave_value_list retval; - #ifdef HAVE_COLAMD - int nargin = args.length (); - int spumoni = 0; if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); - retval.resize (nargout == 2 ? 2 : 1); + octave_value_list retval (nargout == 2 ? 2 : 1); + int spumoni = 0; // Get knobs OCTAVE_LOCAL_BUFFER (double, knobs, COLAMD_KNOBS); @@ -441,13 +438,13 @@ out_stats (COLAMD_INFO2) ++ ; } + return retval; + #else error ("colamd: not available in this version of Octave"); #endif - - return retval; } DEFUN_DLD (symamd, args, nargout, @@ -515,17 +512,15 @@ @seealso{colperm, colamd}\n\ @end deftypefn") { - octave_value_list retval; - #ifdef HAVE_COLAMD int nargin = args.length (); - int spumoni = 0; if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); - retval.resize (nargin == 2 ? 2 : 1); + octave_value_list retval (nargin == 2 ? 2 : 1); + int spumoni = 0; // Get knobs OCTAVE_LOCAL_BUFFER (double, knobs, COLAMD_KNOBS); @@ -633,13 +628,13 @@ out_stats (COLAMD_INFO2) ++ ; } + return retval; + #else error ("symamd: not available in this version of Octave"); #endif - - return retval; } DEFUN_DLD (etree, args, nargout, @@ -660,17 +655,17 @@ permutations on the tree.\n\ @end deftypefn") { - octave_value_list retval; - int nargin = args.length (); if (nargout > 2 || nargin < 1 || nargin > 2) print_usage (); - retval.resize (nargout == 2 ? 2 : 1); + octave_value_list retval (nargout == 2 ? 2 : 1); - octave_idx_type n_row = 0, n_col = 0; - octave_idx_type *ridx = 0, *cidx = 0; + octave_idx_type n_row = 0; + octave_idx_type n_col = 0; + octave_idx_type *ridx = 0; + octave_idx_type *cidx = 0; if (args(0).is_sparse_type ()) {