Mercurial > octave-nkf
diff libinterp/octave-value/ov-classdef.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 | 8b501a0db1e9 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-classdef.cc Thu Feb 26 10:49:20 2015 -0500 +++ b/libinterp/octave-value/ov-classdef.cc Thu Feb 26 13:07:04 2015 -0500 @@ -280,12 +280,11 @@ in_constructor = false; - if (fcn && - (fcn->is_class_method () - || fcn->is_classdef_constructor () - || fcn->is_anonymous_function_of_class () - || (fcn->is_private_function () - && ! fcn->dispatch_class ().empty ()))) + if (fcn && (fcn->is_class_method () + || fcn->is_classdef_constructor () + || fcn->is_anonymous_function_of_class () + || (fcn->is_private_function () + && ! fcn->dispatch_class ().empty ()))) { cls = lookup_class (fcn->dispatch_class ()); if (! error_state) @@ -3626,8 +3625,8 @@ // "end" that makes it impossible to execute the // function call at this stage. - if (type.size () > 1 && - ! fcn->is_postfix_index_handled (type[1])) + if (type.size () > 1 + && ! fcn->is_postfix_index_handled (type[1])) { octave_value_list tmp_args;