Mercurial > octave
diff liboctave/Array-util.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 20 Jan 2011 17:24:59 -0500 |
| parents | a83bad07f7e3 |
| children | 72c96de7a403 |
line wrap: on
line diff
--- a/liboctave/Array-util.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/liboctave/Array-util.cc Thu Jan 20 17:24:59 2011 -0500 @@ -88,9 +88,9 @@ retval = idx(--n); while (--n >= 0) - { + { retval *= dims (n); - + retval += idx(n); } } @@ -129,7 +129,7 @@ if (dim (i) != 1) { retval = false; - + break; } } @@ -167,14 +167,14 @@ if (arr (i) == 1) { retval = true; - + break; } } return retval; } -octave_idx_type +octave_idx_type compute_index (octave_idx_type n, const dim_vector& dims) { if (n < 0) @@ -185,7 +185,7 @@ return n; } -octave_idx_type +octave_idx_type compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims) { if (i < 0 || j < 0) @@ -198,7 +198,7 @@ return j*dims(0) + i; } -octave_idx_type +octave_idx_type compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k, const dim_vector& dims) { @@ -214,7 +214,7 @@ return (k*dims(1) + j)*dims(0) + i; } -octave_idx_type +octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims) { int nd = ra_idx.length (); @@ -428,7 +428,7 @@ dim_vector rdv = dim_vector::alloc (ial); bool *scalar = new bool[ial], *colon = new bool[ial]; // Mark scalars and colons, count non-scalar indices. - int nonsc = 0; + int nonsc = 0; bool all_colons = true; for (int i = 0; i < ial; i++) {