Mercurial > octave-nkf

comparison libinterp/octave-value/ov-perm.cc @ 19898:17d647821d61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4197fc428c7d
children 00cf2847355d
comparison
equal deleted inserted replaced
19897:09ed6f7538dd 19898:17d647821d61
110 } 110 }
111 111
112 // if error_state is set, we've already griped. 112 // if error_state is set, we've already griped.
113 if (! error_state && ! retval.is_defined ()) 113 if (! error_state && ! retval.is_defined ())
114 { 114 {
115 if (nidx == 2 && ! resize_ok && 115 if (nidx == 2 && ! resize_ok && idx0.is_scalar () && idx1.is_scalar ())
116 idx0.is_scalar () && idx1.is_scalar ()) 116 retval = matrix.checkelem (idx0(0), idx1(0));
117 {
118 retval = matrix.checkelem (idx0(0), idx1(0));
119 }
120 else 117 else
121 retval = to_dense ().do_index_op (idx, resize_ok); 118 retval = to_dense ().do_index_op (idx, resize_ok);
122 } 119 }
123 120
124 return retval; 121 return retval;