Mercurial > octave-nkf
diff src/OPERATORS/op-m-sm.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-m-sm.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-m-sm.cc Thu Jan 20 17:24:59 2011 -0500 @@ -80,7 +80,7 @@ { CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); MatrixType typ = v1.matrix_type (); - + Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); v1.matrix_type (typ); @@ -102,16 +102,16 @@ DEFBINOP (el_pow, matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); - - return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), + + return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), v2.sparse_matrix_value ())); } DEFBINOP (el_ldiv, matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); - - return octave_value + + return octave_value (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); } @@ -162,6 +162,6 @@ INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_sparse_matrix, assign) INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, octave_matrix) - INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix, + INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix, sparse_matrix_conv); }