Mercurial > octave-nkf
changeset 11884:cee2f0ae1dba release-3-0-x
Correct cast of matrix by cell or struct concatenation
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Thu, 20 Nov 2008 08:36:37 +0100 |
| parents | a0b28e51e3d2 |
| children | 3342d1a7c4c9 |
| files | src/ChangeLog src/OPERATORS/op-cell.cc src/OPERATORS/op-struct.cc |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Nov 20 08:34:45 2008 +0100 +++ b/src/ChangeLog Thu Nov 20 08:36:37 2008 +0100 @@ -1,3 +1,9 @@ +2008-11-12 David Bateman <dbateman@free.fr> + + * OPERATORS/op-cell.cc (op_catop_matrix_cell): Cast args in the correct + order. + * OPERATORS/op-struct.cc (op_catop_matrix_struct): Ditto. + 2008-10-30 John W. Eaton <jwe@octave.org> * oct-map.cc (Octave_map::index): Copy key_list.
--- a/src/OPERATORS/op-cell.cc Thu Nov 20 08:34:45 2008 +0100 +++ b/src/OPERATORS/op-cell.cc Thu Nov 20 08:36:37 2008 +0100 @@ -70,7 +70,7 @@ const Array<octave_idx_type>&) { octave_value retval; - CAST_BINOP_ARGS (const octave_cell&, const octave_matrix&); + CAST_BINOP_ARGS (const octave_matrix&, const octave_cell&); NDArray tmp = v1.array_value (); dim_vector dv = tmp.dims (); if (dv.all_zero ())
--- a/src/OPERATORS/op-struct.cc Thu Nov 20 08:34:45 2008 +0100 +++ b/src/OPERATORS/op-struct.cc Thu Nov 20 08:36:37 2008 +0100 @@ -69,7 +69,7 @@ const Array<octave_idx_type>&) { octave_value retval; - CAST_BINOP_ARGS (const octave_struct&, const octave_matrix&); + CAST_BINOP_ARGS (const octave_matrix&, const octave_struct&); NDArray tmp = v1.array_value (); dim_vector dv = tmp.dims (); if (dv.all_zero ())