Mercurial > octave
diff libinterp/operators/op-fcs-fs.cc @ 21647:66cae7a6dc47
eliminate some macros for operator definitions
* ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL,
NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN,
UNOPDECL, BINOPDECL, CATOPDECL): Delete macros.
* make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc,
op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-cs.cc,
op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc,
op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc,
op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc,
op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc,
op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc,
op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc,
op-fs-fs.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc,
op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc,
op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc,
op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, ops.h:
Expand eliminated macros in place.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 27 Apr 2016 16:13:40 -0400 |
| parents | 40de9f8f23a6 |
| children | aba2e6293dd8 |
line wrap: on
line diff
--- a/libinterp/operators/op-fcs-fs.cc Wed Apr 27 09:31:39 2016 -0400 +++ b/libinterp/operators/op-fcs-fs.cc Wed Apr 27 16:13:40 2016 -0400 @@ -46,7 +46,8 @@ DEFBINOP (div, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); float d = v2.float_value (); @@ -60,7 +61,8 @@ DEFBINOP (ldiv, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); FloatComplex d = v1.float_complex_value (); @@ -81,7 +83,8 @@ DEFBINOP (el_div, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); float d = v2.float_value (); @@ -95,7 +98,8 @@ DEFBINOP (el_ldiv, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); FloatComplex d = v1.float_complex_value (); @@ -107,14 +111,16 @@ DEFBINOP (el_and, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); return (v1.float_complex_value () != 0.0f && v2.float_value ()); } DEFBINOP (el_or, float_complex, float) { - CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); + const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); + const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); return (v1.float_complex_value () != 0.0f || v2.float_value ()); }