Mercurial > octave-nkf
diff src/ops.h @ 5073:e71be9c548f2
[project @ 2004-11-09 18:31:25 by jwe]
| author | jwe |
|---|---|
| date | Tue, 09 Nov 2004 18:31:26 +0000 |
| parents | 3361e0846469 |
| children | b6a9f78f60e9 |
line wrap: on
line diff
--- a/src/ops.h Tue Nov 09 05:53:11 2004 +0000 +++ b/src/ops.h Tue Nov 09 18:31:26 2004 +0000 @@ -318,7 +318,7 @@ #define CATOPDECL(name, a1, a2) \ static octave_value \ - oct_catop_ ## name (const octave_value& a1, const octave_value& a2, \ + oct_catop_ ## name (octave_value& a1, const octave_value& a2, \ const Array<int>& ra_idx) #define DEFCATOPX(name, t1, t2) \ @@ -332,15 +332,15 @@ #define DEFCATOP_FN(name, t1, t2, f) \ CATOPDECL (name, a1, a2) \ { \ - CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ - return octave_value (f (v1.t1 ## _value (), v2.t2 ## _value (), ra_idx)); \ + CAST_BINOP_ARGS (octave_ ## t1&, const octave_ ## t2&); \ + return octave_value (v1.t1 ## _value (). f (v2.t2 ## _value (), ra_idx)); \ } #define DEFNDCATOP_FN(name, t1, t2, e1, e2, f) \ CATOPDECL (name, a1, a2) \ { \ - CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ - return octave_value (f (v1.e1 ## _value (), v2.e2 ## _value (), ra_idx)); \ + CAST_BINOP_ARGS (octave_ ## t1&, const octave_ ## t2&); \ + return octave_value (v1.e1 ## _value (). f (v2.e2 ## _value (), ra_idx)); \ } #define CATOP_NONCONFORMANT(msg) \