Mercurial > forge
changeset 1690:4d21274e030a octave-forge
DEFCATOP is unavailable in 2.1.57 and below
| author | pkienzle |
|---|---|
| date | Fri, 03 Sep 2004 18:36:24 +0000 |
| parents | 608d5c4d06f2 |
| children | c93fbebdb692 |
| files | main/comm/op-gm-s.cc main/comm/op-s-gm.cc |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/main/comm/op-gm-s.cc Fri Sep 03 18:33:11 2004 +0000 +++ b/main/comm/op-gm-s.cc Fri Sep 03 18:36:24 2004 +0000 @@ -68,12 +68,14 @@ DEFBINOP_FN_B_S2 (el_and, galois, scalar, mx_el_and) DEFBINOP_FN_B_S2 (el_or, galois, scalar, mx_el_or) +#ifdef DEFCATOP DEFCATOP (gm_s, galois, scalar) { CAST_BINOP_ARGS (const octave_galois&, const octave_scalar&); return new octave_galois (concat (v1.galois_value (), v2.matrix_value (), ra_idx)); } +#endif DEFASSIGNOP(assign, galois, scalar) { @@ -106,7 +108,9 @@ INSTALL_BINOP (op_el_and, octave_galois, octave_scalar, el_and); INSTALL_BINOP (op_el_or, octave_galois, octave_scalar, el_or); +#ifdef DEFCATOP INSTALL_G_CATOP (octave_galois, octave_scalar, gm_s); +#endif INSTALL_ASSIGNOP (op_asn_eq, octave_galois, octave_scalar, assign); }
--- a/main/comm/op-s-gm.cc Fri Sep 03 18:33:11 2004 +0000 +++ b/main/comm/op-s-gm.cc Fri Sep 03 18:36:24 2004 +0000 @@ -81,12 +81,14 @@ DEFBINOP_FN_B_S1 (el_and, scalar, galois, mx_el_and) DEFBINOP_FN_B_S1 (el_or, scalar, galois, mx_el_or) +#ifdef DEFCATOP DEFCATOP (s_gm, scalar, galois) { CAST_BINOP_ARGS (const octave_scalar&, const octave_galois&); return new octave_galois (concat (v1.matrix_value (), v2.galois_value (), ra_idx)); } +#endif void install_s_gm_ops (void) @@ -110,7 +112,9 @@ INSTALL_BINOP (op_el_and, octave_scalar, octave_galois, el_and); INSTALL_BINOP (op_el_or, octave_scalar, octave_galois, el_or); +#ifdef DEFCATOP INSTALL_G_CATOP (octave_scalar, octave_galois, s_gm); +#endif INSTALL_ASSIGNCONV (octave_scalar, octave_galois, octave_galois); }