Mercurial > octave
diff libinterp/corefcn/pr-output.cc @ 19318:6c9ea5be96bf
Change charMatrix to subclass charNDArray rather than be another Array<char>.
* chMatrix.h: both charMatrix and charNDArray are Array<char>, the first
being simply 2 dimensional. We change this so that charMatrix inherits from
charNDArray instead.
* chMatrix.cc: remove all constructors which are now inherited from
charNDArray.
* chNDArray.h, chNDArray.cc: implement all constructors here rather than
calling charMatrix. Remove matrix_value() since a charMatrix constructor is
now enough.
* pr-output.cc, octave-value/ov-ch-mat.h, octave-value/ov-str-mat.cc:
replace calls to charNDArray::matrix_value () with the charMatrix constructor.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Fri, 24 Oct 2014 01:31:53 +0100 |
parents | 25f535b90e52 |
children | d0c73e23a505 |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Mon Oct 20 01:34:52 2014 +0100 +++ b/libinterp/corefcn/pr-output.cc Fri Oct 24 01:31:53 2014 +0100 @@ -2842,7 +2842,7 @@ { case 1: case 2: - octave_print_internal (os, nda.matrix_value (), + octave_print_internal (os, charMatrix (nda), pr_as_read_syntax, extra_indent, pr_as_string); break;