Mercurial > octave-nkf
diff src/OPERATORS/op-bm-sbm.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/OPERATORS/op-bm-sbm.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-bm-sbm.cc Thu Jan 20 17:24:59 2011 -0500 @@ -51,7 +51,7 @@ { CAST_BINOP_ARGS (octave_bool_matrix&, const octave_sparse_bool_matrix&); SparseBoolMatrix tmp (v1.bool_matrix_value ()); - return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), + return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), ra_idx)); } @@ -64,7 +64,7 @@ DEFCATOP (bm_sm, bool_matrix, sparse_matrix) { - CAST_BINOP_ARGS (octave_bool_matrix&, const octave_sparse_matrix&); + CAST_BINOP_ARGS (octave_bool_matrix&, const octave_sparse_matrix&); SparseMatrix tmp (v1.matrix_value ()); return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); } @@ -72,7 +72,7 @@ DEFCONV (sparse_bool_matrix_conv, bool_matrix, sparse_bool_matrix) { CAST_CONV_ARG (const octave_bool_matrix&); - return new octave_sparse_bool_matrix + return new octave_sparse_bool_matrix (SparseBoolMatrix (v.bool_matrix_value ())); } @@ -84,20 +84,20 @@ INSTALL_BINOP (op_eq, octave_bool_matrix, octave_sparse_bool_matrix, eq); INSTALL_BINOP (op_ne, octave_bool_matrix, octave_sparse_bool_matrix, ne); - INSTALL_BINOP (op_el_and, octave_bool_matrix, octave_sparse_bool_matrix, + INSTALL_BINOP (op_el_and, octave_bool_matrix, octave_sparse_bool_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_bool_matrix, octave_sparse_bool_matrix, + INSTALL_BINOP (op_el_or, octave_bool_matrix, octave_sparse_bool_matrix, el_or); INSTALL_CATOP (octave_bool_matrix, octave_sparse_bool_matrix, bm_sbm); INSTALL_CATOP (octave_bool_matrix, octave_sparse_matrix, bm_sm); INSTALL_CATOP (octave_matrix, octave_sparse_bool_matrix, m_sbm); - INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_sparse_bool_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_sparse_bool_matrix, assign) - INSTALL_ASSIGNCONV (octave_bool_matrix, octave_sparse_bool_matrix, + INSTALL_ASSIGNCONV (octave_bool_matrix, octave_sparse_bool_matrix, octave_bool_matrix); - INSTALL_WIDENOP (octave_bool_matrix, octave_sparse_bool_matrix, + INSTALL_WIDENOP (octave_bool_matrix, octave_sparse_bool_matrix, sparse_bool_matrix_conv); }