# HG changeset patch # User Jaroslav Hajek # Date 1274770523 -7200 # Node ID 984b8b6bee02bd288b1a19a7601a3676cfa80300 # Parent ec5fa46e0e455c3bdcaaf2b4295e70adf048477d simplify octave_value::length diff -r ec5fa46e0e45 -r 984b8b6bee02 src/ChangeLog --- a/src/ChangeLog Tue May 25 08:53:58 2010 +0200 +++ b/src/ChangeLog Tue May 25 08:55:23 2010 +0200 @@ -1,3 +1,7 @@ +2010-05-25 Jaroslav Hajek + + * ov.cc (octave_value::length): Simplify. + 2010-05-25 Jaroslav Hajek * ov-base-mat.h (octave_base_matrix::ndims): New override. diff -r ec5fa46e0e45 -r 984b8b6bee02 src/ov.cc --- a/src/ov.cc Tue May 25 08:53:58 2010 +0200 +++ b/src/ov.cc Tue May 25 08:55:23 2010 +0200 @@ -1372,18 +1372,12 @@ octave_idx_type octave_value::length (void) const { - int retval = 0; - - dim_vector dv = dims (); + octave_idx_type retval = 0; + + const dim_vector dv = dims (); for (int i = 0; i < dv.length (); i++) { - if (dv(i) < 0) - { - retval = -1; - break; - } - if (dv(i) == 0) { retval = 0;