# HG changeset patch # User jwe # Date 1100642270 0 # Node ID 7929486ef2ed8d212c412c48504de7ae481657f6 # Parent 48b08a36d82c60a1e6b7b7cb0a73b5f10b679612 [project @ 2004-11-16 21:57:50 by jwe] diff -r 48b08a36d82c -r 7929486ef2ed src/ChangeLog --- a/src/ChangeLog Fri Feb 01 21:15:54 2008 -0500 +++ b/src/ChangeLog Tue Nov 16 21:57:50 2004 +0000 @@ -1,3 +1,9 @@ +2004-11-16 David Bateman + + * ov.h (octave_value::numel): Now virtual. Call rep->numel (). + * ov.cc (octave_value::numel): Delete. + * ov-base.h (octave_base_value::numel): New function. + 2004-11-12 John W. Eaton * version.h (OCTAVE_VERSION): Now 2.1.62. diff -r 48b08a36d82c -r 7929486ef2ed src/ov-base.h --- a/src/ov-base.h Fri Feb 01 21:15:54 2008 -0500 +++ b/src/ov-base.h Tue Nov 16 21:57:50 2004 +0000 @@ -96,6 +96,8 @@ dim_vector dims (void) const { return dim_vector (-1, -1); } + int numel (void) const { return dims ().numel (); } + size_t byte_size (void) const { return 0; } octave_value reshape (const dim_vector&) const; diff -r 48b08a36d82c -r 7929486ef2ed src/ov.cc --- a/src/ov.cc Fri Feb 01 21:15:54 2008 -0500 +++ b/src/ov.cc Tue Nov 16 21:57:50 2004 +0000 @@ -1061,14 +1061,6 @@ return n_dims; } -int -octave_value::numel (void) const -{ - dim_vector dv = dims (); - - return dv.numel (); -} - Cell octave_value::cell_value (void) const { diff -r 48b08a36d82c -r 7929486ef2ed src/ov.h --- a/src/ov.h Fri Feb 01 21:15:54 2008 -0500 +++ b/src/ov.h Tue Nov 16 21:57:50 2004 +0000 @@ -360,7 +360,8 @@ int ndims (void) const; - int numel (void) const; + virtual int numel (void) const + { return rep->numel (); } virtual size_t byte_size (void) const { return rep->byte_size (); }