Mercurial > octave-nkf
diff libinterp/octave-value/ov.cc @ 19898:17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
* gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc,
graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc,
oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc,
__magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc,
CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc,
dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc,
kpse.cc: Break long lines before && and ||.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 26 Feb 2015 13:07:04 -0500 |
| parents | 19755f4fc851 |
| children | 075a5e2e1ba5 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc Thu Feb 26 10:49:20 2015 -0500 +++ b/libinterp/octave-value/ov.cc Thu Feb 26 13:07:04 2015 -0500 @@ -2036,8 +2036,9 @@ v2.numeric_conversion_function (); // Try biased (one-sided) conversions first. - if (cf2.type_id () >= 0 && - octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) + if (cf2.type_id () >= 0 + && octave_value_typeinfo::lookup_binary_op (op, t1, + cf2.type_id ())) cf1 = 0; else if (cf1.type_id () >= 0 && octave_value_typeinfo::lookup_binary_op (op, @@ -2097,10 +2098,10 @@ && octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) cf1 = 0; - else if (cf1.type_id () >= 0 && - octave_value_typeinfo::lookup_binary_op (op, - cf1.type_id (), - t2)) + else if (cf1.type_id () >= 0 + && octave_value_typeinfo::lookup_binary_op (op, + cf1.type_id (), + t2)) cf2 = 0; if (cf1)