Mercurial > jwe > octave
changeset 10852:47e013327758
fix bug in n-dimensional character assignment
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 04 Aug 2010 23:29:02 +0200 |
parents | 5b33a5777ab0 |
children | c3813056f94f |
files | src/ChangeLog src/OPERATORS/op-str-m.cc src/OPERATORS/op-str-s.cc src/OPERATORS/op-str-str.cc |
diffstat | 4 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Aug 04 21:07:21 2010 +0200 +++ b/src/ChangeLog Wed Aug 04 23:29:02 2010 +0200 @@ -1,3 +1,9 @@ +2010-08-03 Jaroslav Hajek <highegg@gmail.com> + + * OPERATORS/op-str-str.cc: Fix assignment operator. + * OPERATORS/op-str-s.cc: Likewise. + * OPERATORS/op-str-m.cc: Likewise. + 2010-08-03 Jaroslav Hajek <highegg@gmail.com> * ov-fcn-handle.cc
--- a/src/OPERATORS/op-str-m.cc Wed Aug 04 21:07:21 2010 +0200 +++ b/src/OPERATORS/op-str-m.cc Wed Aug 04 23:29:02 2010 +0200 @@ -41,7 +41,7 @@ a1.is_sq_string () ? '\'' : '"'); if (! error_state) - v1.assign (idx, tmp.char_matrix_value ()); + v1.assign (idx, tmp.char_array_value ()); return octave_value (); }
--- a/src/OPERATORS/op-str-s.cc Wed Aug 04 21:07:21 2010 +0200 +++ b/src/OPERATORS/op-str-s.cc Wed Aug 04 23:29:02 2010 +0200 @@ -41,7 +41,7 @@ a1.is_sq_string () ? '\'' : '"'); if (! error_state) - v1.assign (idx, tmp.char_matrix_value ()); + v1.assign (idx, tmp.char_array_value ()); return octave_value (); }
--- a/src/OPERATORS/op-str-str.cc Wed Aug 04 21:07:21 2010 +0200 +++ b/src/OPERATORS/op-str-str.cc Wed Aug 04 23:29:02 2010 +0200 @@ -89,7 +89,7 @@ { CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_char_matrix_str&); - v1.assign (idx, v2.char_matrix_value ()); + v1.assign (idx, v2.char_array_value ()); return octave_value (); }