Mercurial > octave
diff liboctave/numeric/oct-convn.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 | 407c66ae1e20 |
| children | bac0d6f07a3e |
line wrap: on
line diff
--- a/liboctave/numeric/oct-convn.cc Tue Jul 12 14:28:07 2016 -0400 +++ b/liboctave/numeric/oct-convn.cc Mon Aug 01 12:40:18 2016 -0400 @@ -40,34 +40,36 @@ T *c, bool inner); // Forward instances to our Fortran implementations. -#define FORWARD_IMPL(T_CXX, R_CXX, T, R, T_CAST, T_CONST_CAST, \ - R_CONST_CAST, f, F) \ -extern "C" \ -F77_RET_T \ -F77_FUNC (f##conv2o, F##CONV2O) (const F77_INT&, \ - const F77_INT&, \ - const T*, const F77_INT&, \ - const F77_INT&, const R*, T *); \ -\ -extern "C" \ -F77_RET_T \ -F77_FUNC (f##conv2i, F##CONV2I) (const F77_INT&, \ - const F77_INT&, \ - const T*, const F77_INT&, \ - const F77_INT&, const R*, T *); \ -\ -template <> void \ -convolve_2d<T_CXX, R_CXX> (const T_CXX *a, F77_INT ma, F77_INT na, \ - const R_CXX *b, F77_INT mb, F77_INT nb, \ - T_CXX *c, bool inner) \ -{ \ - if (inner) \ - F77_XFCN (f##conv2i, F##CONV2I, (ma, na, T_CONST_CAST (a), \ - mb, nb, R_CONST_CAST (b), T_CAST (c))); \ - else \ - F77_XFCN (f##conv2o, F##CONV2O, (ma, na, T_CONST_CAST (a), \ - mb, nb, R_CONST_CAST (b), T_CAST (c))); \ -} +#define FORWARD_IMPL(T_CXX, R_CXX, T, R, T_CAST, T_CONST_CAST, \ + R_CONST_CAST, f, F) \ + extern "C" \ + F77_RET_T \ + F77_FUNC (f##conv2o, F##CONV2O) (const F77_INT&, \ + const F77_INT&, \ + const T*, const F77_INT&, \ + const F77_INT&, const R*, T *); \ + \ + extern "C" \ + F77_RET_T \ + F77_FUNC (f##conv2i, F##CONV2I) (const F77_INT&, \ + const F77_INT&, \ + const T*, const F77_INT&, \ + const F77_INT&, const R*, T *); \ + \ + template <> void \ + convolve_2d<T_CXX, R_CXX> (const T_CXX *a, F77_INT ma, F77_INT na, \ + const R_CXX *b, F77_INT mb, F77_INT nb, \ + T_CXX *c, bool inner) \ + { \ + if (inner) \ + F77_XFCN (f##conv2i, F##CONV2I, (ma, na, T_CONST_CAST (a), \ + mb, nb, R_CONST_CAST (b), \ + T_CAST (c))); \ + else \ + F77_XFCN (f##conv2o, F##CONV2O, (ma, na, T_CONST_CAST (a), \ + mb, nb, R_CONST_CAST (b), \ + T_CAST (c))); \ + } FORWARD_IMPL (double, double, F77_DBLE, F77_DBLE, , , , d, D) FORWARD_IMPL (float, float, F77_REAL, F77_REAL, , , , s, S) @@ -162,23 +164,25 @@ return c; } -#define CONV_DEFS(TPREF, RPREF) \ -TPREF ## NDArray \ -convn (const TPREF ## NDArray& a, const RPREF ## NDArray& b, convn_type ct) \ -{ \ - return convolve (a, b, ct); \ -} \ -TPREF ## Matrix \ -convn (const TPREF ## Matrix& a, const RPREF ## Matrix& b, convn_type ct) \ -{ \ - return convolve (a, b, ct); \ -} \ -TPREF ## Matrix \ -convn (const TPREF ## Matrix& a, const RPREF ## ColumnVector& c, \ - const RPREF ## RowVector& r, convn_type ct) \ -{ \ - return convolve (a, c * r, ct); \ -} +#define CONV_DEFS(TPREF, RPREF) \ + TPREF ## NDArray \ + convn (const TPREF ## NDArray& a, const RPREF ## NDArray& b, \ + convn_type ct) \ + { \ + return convolve (a, b, ct); \ + } \ + TPREF ## Matrix \ + convn (const TPREF ## Matrix& a, const RPREF ## Matrix& b, \ + convn_type ct) \ + { \ + return convolve (a, b, ct); \ + } \ + TPREF ## Matrix \ + convn (const TPREF ## Matrix& a, const RPREF ## ColumnVector& c, \ + const RPREF ## RowVector& r, convn_type ct) \ + { \ + return convolve (a, c * r, ct); \ + } CONV_DEFS ( , ) CONV_DEFS (Complex, )