Mercurial > forge
changeset 9953:5991a6dffe51 octave-forge
Cope with the change in the behavior of ismatrix()
ismatrix([]) used to return 0 in Octave 3.2, but now returns returns 1 in 3.6.
Patch from Rafael Laboissiere <rafael@laboissiere.net>
| author | thomas-weber |
|---|---|
| date | Tue, 03 Apr 2012 20:53:27 +0000 |
| parents | 1bf0d2454490 |
| children | 6f51862ed0ed |
| files | main/fixed/inst/fixedpoint.m |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/main/fixed/inst/fixedpoint.m Tue Apr 03 20:51:27 2012 +0000 +++ b/main/fixed/inst/fixedpoint.m Tue Apr 03 20:53:27 2012 +0000 @@ -180,7 +180,7 @@ error ("FAILED"); endif empty = fixed(is,ds,[]); - if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) || + if (isscalar(empty) || !isfixed(empty) || isvector(empty) || !isempty(empty) || isempty(zero)) error ("FAILED"); endif @@ -278,7 +278,7 @@ error ("FAILED"); endif empty = fixed(is*(1+1i),ds*(1+1i),[]); - if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) || + if (isscalar(empty) || !isfixed(empty) || isvector(empty) || !isempty(empty) || isempty(onei) || iscomplex(empty)) ## Not complex, since its type is narrowed!!