Mercurial > hg > octave-nkf
changeset 4502:955cb1e87de2
[project @ 2003-09-08 22:03:36 by jwe]
author | jwe |
---|---|
date | Mon, 08 Sep 2003 22:03:36 +0000 |
parents | 693ad5220d1e |
children | 55db663c15ce |
files | src/ChangeLog src/OPERATORS/op-cs-s.cc |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-09-08 D. <dbateman@free.fr> + + * OPERATORS/op-cs-s.cc (DEFBINOP): First arg is complex, second is + double. + 2003-09-05 John W. Eaton <jwe@bevo.che.wisc.edu> * pt-cell.cc (tree_cell::rvalue): Don't assume that the number of
--- a/src/OPERATORS/op-cs-s.cc +++ b/src/OPERATORS/op-cs-s.cc @@ -133,12 +133,12 @@ { CAST_BINOP_ARGS (const octave_complex&, const octave_scalar&); - double d = v1.double_value (); + Complex d = v1.complex_value (); if (d == 0.0) gripe_divide_by_zero (); - return octave_value (v2.complex_value () / d); + return octave_value (v2.double_value () / d); } DEFBINOP (el_and, complex, scalar)