Mercurial > octave-nkf
changeset 8318:cc29ef9a2d84
Correct cast of matrix by cell or struct concatenation
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Wed, 12 Nov 2008 15:45:00 +0100 |
| parents | 135c0e7d7802 |
| children | c374691576f6 |
| 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 Wed Nov 12 12:31:56 2008 +0000 +++ b/src/ChangeLog Wed Nov 12 15:45:00 2008 +0100 @@ -3,6 +3,12 @@ * dirfcn.cc (Ffilesep): Make it return all file separators when 'all' is given as argument. +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-11-11 Jaroslav Hajek <highegg@gmail.com> * pt-assign.cc: Fix handling of empty cs-lists in assignment LHS.
--- a/src/OPERATORS/op-cell.cc Wed Nov 12 12:31:56 2008 +0000 +++ b/src/OPERATORS/op-cell.cc Wed Nov 12 15:45:00 2008 +0100 @@ -71,7 +71,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 Wed Nov 12 12:31:56 2008 +0000 +++ b/src/OPERATORS/op-struct.cc Wed Nov 12 15:45:00 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 ())