# HG changeset patch # User Jaroslav Hajek # Date 1274766091 -7200 # Node ID 944b78191f030e80ec759b063d4c1c1892899a38 # Parent f0dc41c824cedf6f7dbf344d14a30e001d7f1636 simplify octave_base_value::rows and columns diff -r f0dc41c824ce -r 944b78191f03 src/ChangeLog --- a/src/ChangeLog Mon May 24 17:20:08 2010 -0700 +++ b/src/ChangeLog Tue May 25 07:41:31 2010 +0200 @@ -1,3 +1,8 @@ +2010-05-25 Jaroslav Hajek + + * ov-base.h (octave_base_value::rows, octave_base_value::columns): + Use const where appropriate, don't test for impossible condition. + 2010-05-24 Jaroslav Hajek * Cell.h (Cell::index, Cell::assign, Cell::delete_elements): diff -r f0dc41c824ce -r 944b78191f03 src/ov-base.h --- a/src/ov-base.h Mon May 24 17:20:08 2010 -0700 +++ b/src/ov-base.h Tue May 25 07:41:31 2010 +0200 @@ -277,16 +277,16 @@ octave_idx_type rows (void) const { - dim_vector dv = dims (); + const dim_vector dv = dims (); - return (dv.length () > 0) ? dv(0) : -1; + return dv(0); } octave_idx_type columns (void) const { - dim_vector dv = dims (); + const dim_vector dv = dims (); - return (dv.length () > 1) ? dv(1) : -1; + return dv(1); } virtual int ndims (void) const;