Mercurial > octave
diff liboctave/util/oct-inttypes.h @ 21202:f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
* Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc,
Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc,
Array-voidp.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, CSparse.h, DiagArray2.cc, MArray-C.cc,
MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc, MArray-s.cc, MArray.cc,
MDiagArray2.cc, MSparse-C.cc, MSparse-d.cc, MSparse.h, MatrixType.cc,
PermMatrix.cc, Range.cc, Sparse-C.cc, Sparse-b.cc, Sparse-d.cc, Sparse.cc,
boolMatrix.cc, boolNDArray.cc, boolSparse.cc, chMatrix.cc, chNDArray.cc,
dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc,
dSparse.cc, dSparse.h, dim-vector.cc, fCColVector.cc, fCDiagMatrix.cc,
fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc,
fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, int16NDArray.cc,
int32NDArray.cc, int64NDArray.cc, int8NDArray.cc, intNDArray.cc,
uint16NDArray.cc, uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc,
blaswrap.c, cquit.c, f77-extern.cc, f77-fcn.c, f77-fcn.h, lo-error.c, quit.cc,
quit.h, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc,
CmplxQR.cc, CmplxQRP.cc, CmplxSCHUR.cc, CmplxSVD.cc, CollocWt.cc, DASPK.cc,
DASRT.cc, DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, base-lu.cc, base-qr.cc,
dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc,
dbleQRP.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc,
fCmplxCHOL.cc, fCmplxGEPBAL.cc, fCmplxHESS.cc, fCmplxLU.cc, fCmplxQR.cc,
fCmplxQRP.cc, fCmplxSCHUR.cc, fCmplxSVD.cc, fEIG.cc, floatAEPBAL.cc,
floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc,
floatQRP.cc, floatSCHUR.cc, floatSVD.cc, lo-mappers.cc, lo-specfun.cc,
oct-convn.cc, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-rand.cc,
oct-spparms.cc, randgamma.c, randmtzig.c, randpoisson.c, sparse-chol.cc,
sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, mx-defs.h, dir-ops.cc,
file-ops.cc, file-stat.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc,
oct-group.cc, oct-openmp.h, oct-passwd.cc, oct-syscalls.cc, oct-time.cc,
oct-uname.cc, pathlen.h, sysdir.h, syswait.h, cmd-edit.cc, cmd-hist.cc,
data-conv.cc, f2c-main.c, glob-match.cc, lo-array-errwarn.cc,
lo-array-gripes.cc, lo-cutils.c, lo-cutils.h, lo-ieee.cc, lo-math.h,
lo-regexp.cc, lo-utils.cc, oct-base64.cc, oct-glob.cc, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.cc, oct-mutex.cc, oct-refcount.h, oct-rl-edit.c,
oct-rl-hist.c, oct-shlib.cc, oct-sort.cc, pathsearch.cc, singleton-cleanup.cc,
sparse-sort.cc, sparse-util.cc, statdefs.h, str-vec.cc, unwind-prot.cc,
url-transfer.cc, display-available.h, main-cli.cc, main-gui.cc, main.in.cc,
mkoctfile.in.cc, octave-config.in.cc, shared-fcns.h:
indent #ifdef blocks in liboctave and src directories.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 06 Feb 2016 06:40:13 -0800 |
| parents | 538b57866b90 |
| children | 1473547f50f5 |
line wrap: on
line diff
--- a/liboctave/util/oct-inttypes.h Fri Feb 05 17:58:24 2016 -0800 +++ b/liboctave/util/oct-inttypes.h Sat Feb 06 06:40:13 2016 -0800 @@ -177,74 +177,74 @@ { return xop::op (x, static_cast<double> (y)); } #ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS(T) \ - template <typename xop> static OCTAVE_API bool \ - external_mop (double, T); \ - template <typename xop> static OCTAVE_API bool \ - external_mop (T, double) +# define DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS(T) \ + template <typename xop> static OCTAVE_API bool \ + external_mop (double, T); \ + template <typename xop> static OCTAVE_API bool \ + external_mop (T, double) - DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (int64_t); - DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (uint64_t); + DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (int64_t); + DECLARE_EXTERNAL_LONG_DOUBLE_CMP_OPS (uint64_t); #endif // Typecasting to doubles won't work properly for 64-bit integers -- // they lose precision. // If we have long doubles, use them... #ifdef OCTAVE_INT_USE_LONG_DOUBLE -#ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template <typename xop> \ - static bool \ - mop (double x, T y) \ - { \ - return external_mop<xop> (x, y); \ - } \ - template <typename xop> \ - static bool \ - mop (T x, double y) \ - { \ - return external_mop<xop> (x, y); \ - } -#else -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template <typename xop> \ - static bool \ - mop (double x, T y) \ - { \ - return xop::op (static_cast<long double> (x), \ - static_cast<long double> (y)); \ - } \ - template <typename xop> \ - static bool \ - mop (T x, double y) \ - { \ - return xop::op (static_cast<long double> (x), \ - static_cast<long double> (y)); \ - } -#endif +# ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template <typename xop> \ + static bool \ + mop (double x, T y) \ + { \ + return external_mop<xop> (x, y); \ + } \ + template <typename xop> \ + static bool \ + mop (T x, double y) \ + { \ + return external_mop<xop> (x, y); \ + } +# else +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template <typename xop> \ + static bool \ + mop (double x, T y) \ + { \ + return xop::op (static_cast<long double> (x), \ + static_cast<long double> (y)); \ + } \ + template <typename xop> \ + static bool \ + mop (T x, double y) \ + { \ + return xop::op (static_cast<long double> (x), \ + static_cast<long double> (y)); \ + } +# endif #else // ... otherwise, use external handlers // FIXME: We could declare directly the mop methods as external, // but we can't do this because bugs in gcc (<= 4.3) prevent // explicit instantiations later in that case. -#define DEFINE_LONG_DOUBLE_CMP_OP(T) \ - template <typename xop> static OCTAVE_API bool \ - emulate_mop (double, T); \ - template <typename xop> \ - static bool \ - mop (double x, T y) \ - { \ - return emulate_mop<xop> (x, y); \ - } \ - template <typename xop> static OCTAVE_API bool \ - emulate_mop (T, double); \ - template <typename xop> \ - static bool \ - mop (T x, double y) \ - { \ - return emulate_mop<xop> (x, y); \ - } +# define DEFINE_LONG_DOUBLE_CMP_OP(T) \ + template <typename xop> static OCTAVE_API bool \ + emulate_mop (double, T); \ + template <typename xop> \ + static bool \ + mop (double x, T y) \ + { \ + return emulate_mop<xop> (x, y); \ + } \ + template <typename xop> static OCTAVE_API bool \ + emulate_mop (T, double); \ + template <typename xop> \ + static bool \ + mop (T x, double y) \ + { \ + return emulate_mop<xop> (x, y); \ + } #endif DEFINE_LONG_DOUBLE_CMP_OP(int64_t) @@ -1149,7 +1149,7 @@ #ifdef OCTAVE_INT_USE_LONG_DOUBLE // Handle mixed op using long double #ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED -#define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ +# define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ OCTAVE_INT_DOUBLE_BIN_OP0(OP) \ template <> \ inline octave_int64 \ @@ -1176,7 +1176,7 @@ return external_octave_uint64_double_ ## NAME (x, y); \ } #else -#define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ +# define OCTAVE_INT_DOUBLE_BIN_OP(OP, NAME) \ OCTAVE_INT_DOUBLE_BIN_OP0(OP) \ template <> \ inline octave_int64 \