Mercurial > octave-nkf
diff src/DLD-FUNCTIONS/sparse.cc @ 7287:3f29467c1667
[project @ 2007-12-11 17:03:32 by jwe]
author | jwe |
---|---|
date | Tue, 11 Dec 2007 17:03:33 +0000 |
parents | a1dbe9d80eee |
children | d8209a80e093 |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/sparse.cc Tue Dec 11 16:57:39 2007 +0000 +++ b/src/DLD-FUNCTIONS/sparse.cc Tue Dec 11 17:03:33 2007 +0000 @@ -106,13 +106,11 @@ @end deftypefn") { octave_value retval; - bool mutate = false; // WARNING: This function should always use constructions like // retval = new octave_sparse_matrix (sm); // To avoid calling the maybe_mutate function. This is the only - // function that should not call maybe_mutate, or at least only - // in very particular cases. + // function that should not call maybe_mutate int nargin= args.length(); if (nargin < 1 || (nargin == 4 && !args(3).is_string ()) || nargin > 6) @@ -134,11 +132,7 @@ use_bool = args(0).is_bool_type (); } - if (nargin == 2 && ! args(0).is_scalar_type() && args(1).is_scalar_type()) - mutate = (args(1).double_value() != 0.); - - if (nargin == 1 || (nargin == 2 && ! args(0).is_scalar_type() && - args(1).is_scalar_type())) + if (nargin == 1) { octave_value arg = args (0); @@ -355,10 +349,6 @@ } } - // Only called in very particular cases, not the default case - if (mutate) - retval.maybe_mutate (); - return retval; }