# HG changeset patch
# User David Bateman <dbateman@free.fr>
# Date 1227166597 -3600
# Node ID cee2f0ae1dba64b6332b6dd3f537e48288999ae8
# Parent  a0b28e51e3d2c6161f6f870cb4abaf94100337eb
Correct cast of matrix by cell or struct concatenation

diff -r a0b28e51e3d2 -r cee2f0ae1dba src/ChangeLog
--- 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.
diff -r a0b28e51e3d2 -r cee2f0ae1dba src/OPERATORS/op-cell.cc
--- 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 ())
diff -r a0b28e51e3d2 -r cee2f0ae1dba src/OPERATORS/op-struct.cc
--- 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 ())