Mercurial > octave
diff src/OPERATORS/op-b-bm.cc @ 4964:269c3d6c0569
[project @ 2004-09-04 01:16:28 by jwe]
author | jwe |
---|---|
date | Sat, 04 Sep 2004 01:16:28 +0000 |
parents | c638c144d4da |
children | 57077d0ddc8e |
line wrap: on
line diff
--- a/src/OPERATORS/op-b-bm.cc Fri Sep 03 15:43:30 2004 +0000 +++ b/src/OPERATORS/op-b-bm.cc Sat Sep 04 01:16:28 2004 +0000 @@ -45,10 +45,17 @@ DEFNDBINOP_FN (el_and, bool, bool_matrix, bool, bool_array, mx_el_and) DEFNDBINOP_FN (el_or, bool, bool_matrix, bool, bool_array, mx_el_or) -DEFNDCATOP_FN (b_bm, bool, bool_matrix, array, array, concat) +DEFNDCATOP_FN (b_bm, bool, bool_matrix, bool_array, bool_array, concat) DEFNDCATOP_FN (b_m, bool, matrix, array, array, concat) DEFNDCATOP_FN (s_bm, scalar, bool_matrix, array, array, concat) +DEFCONV (bool_matrix_conv, bool, bool_matrix) +{ + CAST_CONV_ARG (const octave_bool&); + + return new octave_bool_matrix (v.bool_matrix_value ()); +} + void install_b_bm_ops (void) { @@ -58,6 +65,10 @@ INSTALL_CATOP (octave_bool, octave_bool_matrix, b_bm); INSTALL_CATOP (octave_bool, octave_matrix, b_m); INSTALL_CATOP (octave_scalar, octave_bool_matrix, s_bm); + + INSTALL_ASSIGNCONV (octave_bool, octave_bool_matrix, octave_bool_matrix); + + INSTALL_WIDENOP (octave_bool, octave_bool_matrix, bool_matrix_conv); } /*