Mercurial > octave-nkf
diff src/ov-cx-sparse.cc @ 6221:8e0f1eda266b
[project @ 2007-01-03 17:23:33 by jwe]
author | jwe |
---|---|
date | Wed, 03 Jan 2007 17:23:34 +0000 |
parents | c68896f193e3 |
children | 2aad75fcc93a |
line wrap: on
line diff
--- a/src/ov-cx-sparse.cc Sat Dec 30 17:29:35 2006 +0000 +++ b/src/ov-cx-sparse.cc Wed Jan 03 17:23:34 2007 +0000 @@ -126,8 +126,9 @@ // FIXME -- maybe this should be a function, valid_as_scalar() if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", - "complex sparse matrix", "real scalar"); + if (numel () > 1) + gripe_implicit_conversion ("Octave:array-as-scalar", + "complex sparse matrix", "real scalar"); retval = std::real (matrix (0, 0)); } @@ -161,8 +162,9 @@ // FIXME -- maybe this should be a function, valid_as_scalar() if (numel () > 0) { - gripe_implicit_conversion ("Octave:array-as-scalar", - "complex sparse matrix", "real scalar"); + if (numel () > 1) + gripe_implicit_conversion ("Octave:array-as-scalar", + "complex sparse matrix", "real scalar"); retval = matrix (0, 0); }