Mercurial > octave

diff libinterp/octave-value/ov-bool-mat.cc @ 19317:25f535b90e52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>. * boolMatrix.h: both boolMatrix and boolNDArray are Array<bool>, the first being simply 2 dimensional. We change this so that boolMatrix inherits from boolNDArray instead. * boolNDArray.cc, boolNDArray.h (boolNDArray::matrix_value): remove method since boolMatrix can be constructed from its parent. (boolNDArray::boolNDArray): remove constructor from boolMatrix * pr-output.cc, octave-value/ov-bool-mat.cc, octave-value/ov-bool-mat.h: replace calls to boolNDArray::matrix_value () with the boolMatrix constructor.
author Carnë Draug <carandraug@octave.org>
date Mon, 20 Oct 2014 01:34:52 +0100
parents 9ac2357f19bc
children 76478d2da117
line wrap: on
line diff
--- a/libinterp/octave-value/ov-bool-mat.cc	Mon Nov 10 16:43:39 2014 +0100
+++ b/libinterp/octave-value/ov-bool-mat.cc	Mon Oct 20 01:34:52 2014 +0100
@@ -79,7 +79,7 @@
 
   if (matrix.ndims () == 2)
     {
-      boolMatrix bm = matrix.matrix_value ();
+      boolMatrix bm (matrix);
 
       octave_idx_type nr = bm.rows ();
       octave_idx_type nc = bm.cols ();