Mercurial > octave-nkf

changeset 8323:655193554ad2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct use of resize_fill_value in Array2<T>::index methods.
author David Bateman <dbateman@free.fr>
date Fri, 14 Nov 2008 12:04:35 +0100
parents f32a91d99156
children 1e9cf8ff48f8
files liboctave/Array2.h liboctave/ChangeLog
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array2.h	Fri Nov 14 11:47:55 2008 +0100
+++ b/liboctave/Array2.h	Fri Nov 14 12:04:35 2008 +0100
@@ -117,14 +117,14 @@
     }
 
   Array2<T> index (idx_vector& i, int resize_ok = 0,
-		   const T& rfv = resize_fill_value (T ())) const
+		   const T& rfv = Array<T>::resize_fill_value ()) const
     {
       Array<T> tmp = Array<T>::index (i, resize_ok, rfv);
       return Array2<T> (tmp, tmp.rows (), tmp.columns ());
     }
 
   Array2<T> index (idx_vector& i, idx_vector& j, int resize_ok = 0,
-		   const T& rfv = resize_fill_value (T ())) const
+		   const T& rfv = Array<T>::resize_fill_value ()) const
     {
       Array<T> tmp = Array<T>::index (i, j, resize_ok, rfv);
       return Array2<T> (tmp, tmp.rows (), tmp.columns ());
--- a/liboctave/ChangeLog	Fri Nov 14 11:47:55 2008 +0100
+++ b/liboctave/ChangeLog	Fri Nov 14 12:04:35 2008 +0100
@@ -17,6 +17,11 @@
 	tag.
 	* oct-norm.cc (xnorm, xfrobnorm, xcolnorms, xrownorms): Ditto.
 
+2008-11-14  David Bateman  <dbateman@free.fr>
+
+	* Array2.h (Array2<T> Array2<T>::index): Correct use of
+	resize_fill_value.
+
 2008-11-12  Jaroslav Hajek <highegg@gmail.com>
 
 	* DiagArray2.h (DiagArray2<T>::maybe_delete_elements): Remove