Mercurial > octave-nkf
changeset 7209:f06b8150fe56
[project @ 2007-11-28 05:46:58 by jwe]
| author | jwe |
|---|---|
| date | Wed, 28 Nov 2007 05:46:59 +0000 |
| parents | a730e47fda4d |
| children | 818b1417bce9 |
| files | src/Cell.cc src/Cell.h src/ChangeLog src/TEMPLATE-INST/Array-tc.cc |
| diffstat | 4 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Cell.cc Wed Nov 28 02:32:42 2007 +0000 +++ b/src/Cell.cc Wed Nov 28 05:46:59 2007 +0000 @@ -57,8 +57,9 @@ // Set size to DV, filling with []. Then fill with as many elements of // SV as possible. + Cell::Cell (const dim_vector& dv, const string_vector& sv, bool trim) - : ArrayN<octave_value> (dv) + : ArrayN<octave_value> (dv, resize_fill_value ()) { octave_idx_type n = sv.length ();
--- a/src/Cell.h Wed Nov 28 02:32:42 2007 +0000 +++ b/src/Cell.h Wed Nov 28 05:46:59 2007 +0000 @@ -50,7 +50,8 @@ elem (i) = ovl (i); } - Cell (octave_idx_type n, octave_idx_type m, const octave_value& val = resize_fill_value ()) + Cell (octave_idx_type n, octave_idx_type m, + const octave_value& val = resize_fill_value ()) : ArrayN<octave_value> (dim_vector (n, m), val) { } Cell (const dim_vector& dv, const octave_value& val = resize_fill_value ())
--- a/src/ChangeLog Wed Nov 28 02:32:42 2007 +0000 +++ b/src/ChangeLog Wed Nov 28 05:46:59 2007 +0000 @@ -1,5 +1,16 @@ +2007-11-28 John W. Eaton <jwe@octave.org> + + * TEMPLATE-INST/Array-tc.cc (resize_fill_value<octave_value>): + Delete. + + * Cell.cc (Cell::Cell (const dim_vector&, const string_vector&, bool)): + Initialize undefined values to resize_fill_value (). + 2007-11-27 John W. Eaton <jwe@octave.org> + * TEMPLATE-INST/Array-tc.cc (resize_fill_value<octave_value>): + Tag inline. From Moritz Borgmann <octave@moriborg.de>. + * pt-bp.cc (tree_breakpoint::visit_decl_command): Also check line number of cmd. * pt-decl.cc (tree_global_command::eval, tree_static_command::eval):
--- a/src/TEMPLATE-INST/Array-tc.cc Wed Nov 28 02:32:42 2007 +0000 +++ b/src/TEMPLATE-INST/Array-tc.cc Wed Nov 28 05:46:59 2007 +0000 @@ -40,14 +40,6 @@ #include "oct-obj.h" -template<> OCTINTERP_API -octave_value -resize_fill_value<octave_value> (const octave_value&) -{ - static octave_value retval = octave_value (Matrix ()); - return retval; -} - template class OCTINTERP_API Array<octave_value>; INSTANTIATE_ARRAY_ASSIGN (octave_value, octave_value, OCTINTERP_API);