diff liboctave/chNDArray.h @ 9732:b4fdfee405b5

remove ArrayN<T> + fix nonhom. diag-scalar ops
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 16 Oct 2009 13:12:31 +0200
parents b29504415a2e
children f80c566bc751
line wrap: on
line diff
--- a/liboctave/chNDArray.h	Fri Oct 16 10:28:26 2009 +0200
+++ b/liboctave/chNDArray.h	Fri Oct 16 13:12:31 2009 +0200
@@ -55,7 +55,7 @@
 
   charNDArray (const string_vector& s) : MArrayN<char> (charMatrix (s)) { }
 
-  charNDArray (const ArrayN<char>& a) : MArrayN<char> (a) { }
+  charNDArray (const Array<char>& a) : MArrayN<char> (a) { }
 
   charNDArray& operator = (const charNDArray& a)
     {
@@ -77,7 +77,7 @@
   
   charMatrix matrix_value (void) const;
 
-  charNDArray squeeze (void) const { return ArrayN<char>::squeeze (); }
+  charNDArray squeeze (void) const { return Array<char>::squeeze (); }
 
   static void increment_index (Array<octave_idx_type>& ra_idx,
 			       const dim_vector& dimensions,