Mercurial > hg > octave-nkf

diff liboctave/fNDArray.cc @ 10350:12884915a8e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents 83fa590b8a09
children a3635bc1ea19
line wrap: on
line diff
--- a/liboctave/fNDArray.cc
+++ b/liboctave/fNDArray.cc
@@ -46,7 +46,7 @@
 #include "bsxfun-defs.cc"
 
 FloatNDArray::FloatNDArray (const charNDArray& a)
-  : MArrayN<float> (a.dims ())
+  : MArray<float> (a.dims ())
 {
   octave_idx_type n = a.numel ();
   for (octave_idx_type i = 0; i < n; i++)
@@ -898,7 +898,7 @@
 FloatNDArray
 FloatNDArray::diag (octave_idx_type k) const
 {
-  return MArrayN<float>::diag (k);
+  return MArray<float>::diag (k);
 }
 
 // This contains no information on the array structure !!!