--- a/src/OPERATORS/op-cm-m.cc	Fri Oct 17 04:41:36 2003 +0000
+++ b/src/OPERATORS/op-cm-m.cc	Sat Oct 18 03:53:53 2003 +0000
@@ -43,8 +43,9 @@
 
 // complex matrix by matrix ops.
 
-DEFBINOP_OP (add, complex_matrix, matrix, +)
-DEFBINOP_OP (sub, complex_matrix, matrix, -)
+DEFNDBINOP_OP (add, complex_matrix, matrix, array, array, +)
+DEFNDBINOP_OP (sub, complex_matrix, matrix, array, array, -)
+
 DEFBINOP_OP (mul, complex_matrix, matrix, *)
 DEFBINOP_FN (div, complex_matrix, matrix, xdiv)
 
@@ -56,26 +57,26 @@
 
 DEFBINOP_FN (ldiv, complex_matrix, matrix, xleftdiv)
 
-DEFBINOP_FN (lt, complex_matrix, matrix, mx_el_lt)
-DEFBINOP_FN (le, complex_matrix, matrix, mx_el_le)
-DEFBINOP_FN (eq, complex_matrix, matrix, mx_el_eq)
-DEFBINOP_FN (ge, complex_matrix, matrix, mx_el_ge)
-DEFBINOP_FN (gt, complex_matrix, matrix, mx_el_gt)
-DEFBINOP_FN (ne, complex_matrix, matrix, mx_el_ne)
+DEFNDBINOP_FN (lt, complex_matrix, matrix, array, array, mx_el_lt)
+DEFNDBINOP_FN (le, complex_matrix, matrix, array, array, mx_el_le)
+DEFNDBINOP_FN (eq, complex_matrix, matrix, array, array, mx_el_eq)
+DEFNDBINOP_FN (ge, complex_matrix, matrix, array, array, mx_el_ge)
+DEFNDBINOP_FN (gt, complex_matrix, matrix, array, array, mx_el_gt)
+DEFNDBINOP_FN (ne, complex_matrix, matrix, array, array, mx_el_ne)
 
-DEFBINOP_FN (el_mul, complex_matrix, matrix, product)
-DEFBINOP_FN (el_div, complex_matrix, matrix, quotient)
-DEFBINOP_FN (el_pow, complex_matrix, matrix, elem_xpow)
+DEFNDBINOP_FN (el_mul, complex_matrix, matrix, array, array, product)
+DEFNDBINOP_FN (el_div, complex_matrix, matrix, array, array, quotient)
+DEFNDBINOP_FN (el_pow, complex_matrix, matrix, array, array, elem_xpow)
 
 DEFBINOP (el_ldiv, complex_matrix, matrix)
 {
   CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&);
 
-  return quotient (v2.matrix_value (), v1.complex_matrix_value ());
+  return quotient (v2.array_value (), v1.array_value ());
 }
 
-DEFBINOP_FN (el_and, complex_matrix, matrix, mx_el_and)
-DEFBINOP_FN (el_or, complex_matrix, matrix, mx_el_or)
+DEFNDBINOP_FN (el_and, complex_matrix, matrix, array, array, mx_el_and)
+DEFNDBINOP_FN (el_or,  complex_matrix, matrix, array, array, mx_el_or)
 
 DEFASSIGNOP_FN (assign, complex_matrix, matrix, assign)