Mercurial > hg > octave-lyh

changeset 5080:7929486ef2ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-11-16 21:57:50 by jwe]
author jwe
date Tue, 16 Nov 2004 21:57:50 +0000
parents 48b08a36d82c
children 273205761b4d
files src/ChangeLog src/ov-base.h src/ov.cc src/ov.h
diffstat 4 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-16  David Bateman  <dbateman@free.fr>
+
+	* 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  <jwe@octave.org>
 
 	* version.h (OCTAVE_VERSION): Now 2.1.62.
--- a/src/ov-base.h
+++ b/src/ov-base.h
@@ -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;
--- a/src/ov.cc
+++ b/src/ov.cc
@@ -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
 {
--- a/src/ov.h
+++ b/src/ov.h
@@ -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 (); }