# HG changeset patch
# User Jason Riedy <jason@acm.org>
# Date 1236353250 18000
# Node ID f5408862892fd842103d9dd5dd5086036a4532db
# Parent  d707aa3bbc36ebbbb85ec7d5ee867d18971f4fb4
Consistently use element_type in the array classes.

diff -r d707aa3bbc36 -r f5408862892f liboctave/ChangeLog
--- a/liboctave/ChangeLog	Fri Mar 06 13:42:24 2009 +0100
+++ b/liboctave/ChangeLog	Fri Mar 06 10:27:30 2009 -0500
@@ -1,3 +1,14 @@
+2009-03-05  Jason Riedy  <jason@acm.org>
+
+	* Sparse.h (Sparse<T>::elt_type): Remove typedef, replace with:
+	* Sparse.h (Sparse<T>::element_type): Add typedef to be consistent
+	with Array.h
+	* DiagArray2.h (DiagArray2<T>::elt_type): Likewise, removed.
+	* DiagArray2.h (DiagArray2<T>::element_type): Define by using
+	Array<T>::element_type.
+	* intNDArray.h (intNDArray<T>::element_type): Remove, inherited
+	from MArrayN<T>.
+
 2009-03-05  Jaroslav Hajek  <highegg@gmail.com>
 
 	* dSparse.h (SparseMatrix::SparseMatrix(const PermMatrix&)): New
diff -r d707aa3bbc36 -r f5408862892f liboctave/DiagArray2.h
--- a/liboctave/DiagArray2.h	Fri Mar 06 13:42:24 2009 +0100
+++ b/liboctave/DiagArray2.h	Fri Mar 06 10:27:30 2009 -0500
@@ -94,7 +94,7 @@
 
 public:
 
-  typedef T element_type;
+  using Array<T>::element_type;
 
   DiagArray2 (void) 
     : Array<T> (), d1 (0), d2 (0) { }
diff -r d707aa3bbc36 -r f5408862892f liboctave/Sparse.h
--- a/liboctave/Sparse.h	Fri Mar 06 13:42:24 2009 +0100
+++ b/liboctave/Sparse.h	Fri Mar 06 10:27:30 2009 -0500
@@ -48,7 +48,7 @@
 {
 public:
 
-  typedef T elt_type;
+  typedef T element_type;
 
 protected:
   //--------------------------------------------------------------------
diff -r d707aa3bbc36 -r f5408862892f liboctave/intNDArray.h
--- a/liboctave/intNDArray.h	Fri Mar 06 13:42:24 2009 +0100
+++ b/liboctave/intNDArray.h	Fri Mar 06 10:27:30 2009 -0500
@@ -32,7 +32,7 @@
 {
 public:
 
-  typedef T elt_type;
+  using MArrayN<T>::element_type;
   
   intNDArray (void) : MArrayN<T> () { }
 
diff -r d707aa3bbc36 -r f5408862892f src/ChangeLog
--- a/src/ChangeLog	Fri Mar 06 13:42:24 2009 +0100
+++ b/src/ChangeLog	Fri Mar 06 10:27:30 2009 -0500
@@ -69,6 +69,11 @@
 	tree_anon_fcn_handle::return_list, tree_anon_fcn_handle::body,
 	tree_anon_fcn_handle::scope): Ditto.
 
+2009-03-05  Jason Riedy  <jason@acm.org>
+
+	* ov-base-int.cc (convert_to_str_internal): Replace elt_type with
+	element_type throughout.
+
 2009-03-05  Jaroslav Hajek  <highegg@gmail.com>
 
 	* DLD-FUNCTIONS/sparse.cc (Fsparse): Handle diagonal and permutation
diff -r d707aa3bbc36 -r f5408862892f src/ov-base-int.cc
--- a/src/ov-base-int.cc	Fri Mar 06 13:42:24 2009 +0100
+++ b/src/ov-base-int.cc	Fri Mar 06 10:27:30 2009 -0500
@@ -145,9 +145,9 @@
     {
       OCTAVE_QUIT;
 
-      typename T::elt_type tmp = this->matrix(i);
+      typename T::element_type tmp = this->matrix(i);
 
-      typedef typename T::elt_type::val_type val_type;
+      typedef typename T::element_type::val_type val_type;
 
       val_type ival = tmp.value ();