# HG changeset patch # User jwe # Date 1196228819 0 # Node ID f06b8150fe56b288055fac8b2bb3be206ce55967 # Parent a730e47fda4de105a529be53f0e7d2292dd96285 [project @ 2007-11-28 05:46:58 by jwe] diff --git a/src/Cell.cc b/src/Cell.cc --- a/src/Cell.cc +++ b/src/Cell.cc @@ -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 (dv) + : ArrayN (dv, resize_fill_value ()) { octave_idx_type n = sv.length (); diff --git a/src/Cell.h b/src/Cell.h --- a/src/Cell.h +++ b/src/Cell.h @@ -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 (dim_vector (n, m), val) { } Cell (const dim_vector& dv, const octave_value& val = resize_fill_value ()) diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,16 @@ +2007-11-28 John W. Eaton + + * TEMPLATE-INST/Array-tc.cc (resize_fill_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 + * TEMPLATE-INST/Array-tc.cc (resize_fill_value): + Tag inline. From Moritz Borgmann . + * 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): diff --git a/src/TEMPLATE-INST/Array-tc.cc b/src/TEMPLATE-INST/Array-tc.cc --- a/src/TEMPLATE-INST/Array-tc.cc +++ b/src/TEMPLATE-INST/Array-tc.cc @@ -40,14 +40,6 @@ #include "oct-obj.h" -template<> OCTINTERP_API -octave_value -resize_fill_value (const octave_value&) -{ - static octave_value retval = octave_value (Matrix ()); - return retval; -} - template class OCTINTERP_API Array; INSTANTIATE_ARRAY_ASSIGN (octave_value, octave_value, OCTINTERP_API);