Mercurial > octave-nkf
changeset 12433:02669a1aa070
regexp.cc: avoid deprecated Array<T>:resize function
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 10 Feb 2011 00:58:31 -0500 |
parents | afb65a7bc065 |
children | 0f21f258aa17 |
files | src/ChangeLog src/DLD-FUNCTIONS/regexp.cc src/graphics.h.in |
diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 09 16:26:35 2011 -0500 +++ b/src/ChangeLog Thu Feb 10 00:58:31 2011 -0500 @@ -1,3 +1,8 @@ +2011-02-10 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/regexp.cc (octregexp_list): Avoid deprecated + Array<T>::resize function. + 2011-02-09 Konstantinos Poulios <logari81@googlemail.com> * graphics.cc (axes::properties::update_xlabel_position,
--- a/src/DLD-FUNCTIONS/regexp.cc Wed Feb 09 16:26:35 2011 -0500 +++ b/src/DLD-FUNCTIONS/regexp.cc Thu Feb 10 00:58:31 2011 -0500 @@ -237,14 +237,14 @@ for (int i = 0; i < nnames; i++) if (named(i) == tmp_name) { - named_idx.resize(inames+1, 1); + named_idx.resize (dim_vector (inames+1, 1)); named_idx(inames) = i; found = true; break; } if (! found) { - named_idx.resize(inames+1, 1); + named_idx.resize (dim_vector (inames+1, 1)); named_idx(inames) = nnames; named.append(tmp_name); nnames++;
--- a/src/graphics.h.in Wed Feb 09 16:26:35 2011 -0500 +++ b/src/graphics.h.in Thu Feb 10 00:58:31 2011 -0500 @@ -3737,6 +3737,7 @@ text (const graphics_handle& mh, const graphics_handle& p) : base_graphics_object (), xproperties (mh, p) { + xproperties.set_clipping ("off"); xproperties.override_defaults (*this); }