# HG changeset patch # User David Bateman # Date 1371906833 -7200 # Node ID 617a6e5a974ab8158e4cc411495b1fd6babddb93 # Parent f4eef73b6e90a2fb021def3d27cbd6762a9ebdc5 Partially undo the changeset 8fce0ed4894a as sparse specialized version of is_empty can be used in all cases. diff --git a/libinterp/octave-value/ov-base-sparse.cc b/libinterp/octave-value/ov-base-sparse.cc --- a/libinterp/octave-value/ov-base-sparse.cc +++ b/libinterp/octave-value/ov-base-sparse.cc @@ -278,15 +278,6 @@ template bool -octave_base_sparse::is_empty (void) const -{ - dim_vector dv = dims (); - - return (dv.any_zero ()); -} - -template -bool octave_base_sparse::print_as_scalar (void) const { dim_vector dv = dims (); diff --git a/libinterp/octave-value/ov-base-sparse.h b/libinterp/octave-value/ov-base-sparse.h --- 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; diff --git a/libinterp/octave-value/ov-base.h b/libinterp/octave-value/ov-base.h --- 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; }