--- a/src/ChangeLog	Sat Aug 29 11:50:59 2009 -0400
+++ b/src/ChangeLog	Sun Aug 30 10:32:10 2009 +0200
@@ -1,3 +1,8 @@
+2009-08-30  Jaroslav Hajek  <highegg@gmail.com>
+
+	* ops.h (BOOL_OP1, BOOL_OP2, BOOL_OP3, SC_MX_BOOL_OP, MX_SC_BOOL_OP,
+	MX_MX_BOOL_OP): Remove.
+
 2009-08-28  John W. Eaton  <jwe@octave.org>
 
 	* genprops.awk: Generate static member functions has_core_property

--- a/src/ops.h	Sat Aug 29 11:50:59 2009 -0400
+++ b/src/ops.h	Sun Aug 30 10:32:10 2009 +0200
@@ -73,76 +73,6 @@
   octave_value_typeinfo::register_widening_op \
     (t1::static_type_id (), t2::static_type_id (), CONCAT2(oct_conv_, f));
 
-#define BOOL_OP1(xt, xn, get_x, yt, yn, get_y) \
-  xt xn = get_x; \
-  yt yn = get_y;
-
-#define BOOL_OP2(x) \
-  octave_idx_type nr = x.rows (); \
-  octave_idx_type nc = x.columns ();
-
-#define BOOL_OP3(test) \
-  boolMatrix retval (nr, nc); \
-  for (octave_idx_type j = 0; j < nc; j++) \
-    for (octave_idx_type i = 0; i < nr; i++) \
-      retval (i, j) = test; \
-  return retval;
-
-#define SC_MX_BOOL_OP(st, sn, get_s, mt, mn, get_m, test, empty_result) \
-  do \
-    { \
-      BOOL_OP1 (st, sn, get_s, mt, mn, get_m) \
-      BOOL_OP2 (mn) \
-      if (nr == 0 || nc == 0) \
-        return empty_result; \
-      BOOL_OP3 (test) \
-    } \
-  while (0)
-
-#define MX_SC_BOOL_OP(mt, mn, get_m, st, sn, get_s, test, empty_result) \
-  do \
-    { \
-      BOOL_OP1 (mt, mn, get_m, st, sn, get_s) \
-      BOOL_OP2 (mn) \
-      if (nr == 0 || nc == 0) \
-        return empty_result; \
-      BOOL_OP3 (test) \
-    } \
-  while (0)
-
-#define MX_MX_BOOL_OP(m1t, m1n, get_m1, m2t, m2n, get_m2, test, op, \
-		      one_empty_result, two_empty_result) \
-  do \
-    { \
-      BOOL_OP1 (m1t, m1n, get_m1, m2t, m2n, get_m2) \
-      octave_idx_type m1_nr = m1n.rows (); \
-      octave_idx_type m1_nc = m1n.cols (); \
-      octave_idx_type m2_nr = m2n.rows (); \
-      octave_idx_type m2_nc = m2n.cols (); \
-      if (m1_nr == m2_nr && m1_nc == m2_nc) \
-	{ \
-	  if (m1_nr == 0 && m1_nc == 0) \
-	    return two_empty_result; \
-	  else \
-	    { \
-	      BOOL_OP2 (m1n) \
-	      BOOL_OP3 (test) \
-	    } \
-	} \
-      else \
-	{ \
-	  if ((m1_nr == 0 && m1_nc == 0) || (m2_nr == 0 && m2_nc == 0)) \
-	    return one_empty_result; \
-	  else \
-	    { \
-	      gripe_nonconformant ("operator " op, m1_nr, m1_nc, \
-				   m2_nr, m2_nc); \
-	      return boolMatrix (); \
-	    } \
-	} \
-    } \
-  while (0)
-
 #define CAST_UNOP_ARG(t) \
   t v = dynamic_cast<t> (a)