# HG changeset patch # User David Bateman # Date 1226501100 -3600 # Node ID cc29ef9a2d84c53334567fa7c97f09b64c8eaa79 # Parent 135c0e7d78020fc0f5eb3344f5e12c4168b2ea83 Correct cast of matrix by cell or struct concatenation diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,12 @@ * dirfcn.cc (Ffilesep): Make it return all file separators when 'all' is given as argument. +2008-11-12 David Bateman + + * 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 * pt-assign.cc: Fix handling of empty cs-lists in assignment LHS. diff --git a/src/OPERATORS/op-cell.cc b/src/OPERATORS/op-cell.cc --- a/src/OPERATORS/op-cell.cc +++ b/src/OPERATORS/op-cell.cc @@ -71,7 +71,7 @@ const Array&) { 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 ()) diff --git a/src/OPERATORS/op-struct.cc b/src/OPERATORS/op-struct.cc --- a/src/OPERATORS/op-struct.cc +++ b/src/OPERATORS/op-struct.cc @@ -69,7 +69,7 @@ const Array&) { 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 ())