Mercurial > octave
comparison liboctave/array/MArray.cc @ 22197:e43d83253e28
refill multi-line macro definitions
Use the Emacs C++ mode style for line continuation markers in
multi-line macro definitions.
* make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc,
bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h,
defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h,
jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h,
mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h,
psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h,
utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc,
ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc,
ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc,
ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h,
op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc,
MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h,
Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc,
idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc,
lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h,
oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc,
mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h,
lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc,
oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 01 Aug 2016 12:40:18 -0400 |
parents | 9b832e9caae6 |
children | bac0d6f07a3e |
comparison
equal
deleted
inserted
replaced
22196:dd992fd74fce | 22197:e43d83253e28 |
---|---|
301 return a; | 301 return a; |
302 } | 302 } |
303 | 303 |
304 // Element by element MArray by scalar ops. | 304 // Element by element MArray by scalar ops. |
305 | 305 |
306 #define MARRAY_NDS_OP(OP, FN) \ | 306 #define MARRAY_NDS_OP(OP, FN) \ |
307 template <typename T> \ | 307 template <typename T> \ |
308 MArray<T> \ | 308 MArray<T> \ |
309 operator OP (const MArray<T>& a, const T& s) \ | 309 operator OP (const MArray<T>& a, const T& s) \ |
310 { \ | 310 { \ |
311 return do_ms_binary_op<T, T, T> (a, s, FN); \ | 311 return do_ms_binary_op<T, T, T> (a, s, FN); \ |
312 } | 312 } |
313 | 313 |
314 MARRAY_NDS_OP (+, mx_inline_add) | 314 MARRAY_NDS_OP (+, mx_inline_add) |
315 MARRAY_NDS_OP (-, mx_inline_sub) | 315 MARRAY_NDS_OP (-, mx_inline_sub) |
316 MARRAY_NDS_OP (*, mx_inline_mul) | 316 MARRAY_NDS_OP (*, mx_inline_mul) |
317 MARRAY_NDS_OP (/, mx_inline_div) | 317 MARRAY_NDS_OP (/, mx_inline_div) |
318 | 318 |
319 // Element by element scalar by MArray ops. | 319 // Element by element scalar by MArray ops. |
320 | 320 |
321 #define MARRAY_SND_OP(OP, FN) \ | 321 #define MARRAY_SND_OP(OP, FN) \ |
322 template <typename T> \ | 322 template <typename T> \ |
323 MArray<T> \ | 323 MArray<T> \ |
324 operator OP (const T& s, const MArray<T>& a) \ | 324 operator OP (const T& s, const MArray<T>& a) \ |
325 { \ | 325 { \ |
326 return do_sm_binary_op<T, T, T> (s, a, FN); \ | 326 return do_sm_binary_op<T, T, T> (s, a, FN); \ |
327 } | 327 } |
328 | 328 |
329 MARRAY_SND_OP (+, mx_inline_add) | 329 MARRAY_SND_OP (+, mx_inline_add) |
330 MARRAY_SND_OP (-, mx_inline_sub) | 330 MARRAY_SND_OP (-, mx_inline_sub) |