Mercurial > hg > octave-shane
changeset 16804:617a6e5a974a
Partially undo the changeset 8fce0ed4894a as sparse specialized version of is_empty can be used in all cases.
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Sat, 22 Jun 2013 15:13:53 +0200 |
| parents | f4eef73b6e90 |
| children | 2281d957cde6 |
| files | libinterp/octave-value/ov-base-sparse.cc libinterp/octave-value/ov-base-sparse.h libinterp/octave-value/ov-base.h |
| diffstat | 3 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-base-sparse.cc +++ b/libinterp/octave-value/ov-base-sparse.cc @@ -278,15 +278,6 @@ template <class T> bool -octave_base_sparse<T>::is_empty (void) const -{ - dim_vector dv = dims (); - - return (dv.any_zero ()); -} - -template <class T> -bool octave_base_sparse<T>::print_as_scalar (void) const { dim_vector dv = dims ();
--- a/libinterp/octave-value/ov-base-sparse.h +++ b/libinterp/octave-value/ov-base-sparse.h @@ -139,8 +139,6 @@ bool is_defined (void) const { return true; } - bool is_empty (void) const; - bool is_constant (void) const { return true; } bool is_true (void) const;
--- a/libinterp/octave-value/ov-base.h +++ b/libinterp/octave-value/ov-base.h @@ -331,7 +331,7 @@ virtual bool is_defined (void) const { return false; } - virtual bool is_empty (void) const { return numel () == 0; } + bool is_empty (void) const { return (dims ().any_zero ()); } virtual bool is_cell (void) const { return false; }