Mercurial > octave-nkf
changeset 19491:cb35d695713c
avoid shadowed variable warnings from GCC
* CMatrix.cc (ComplexMatrix::utsolve, ComplexMatrix::ltsolve):
Eliminate shadowed variable declarations.
* dMatrix.cc (Matrix::utsolve, Matrix::ltsolve):
Avoid shadowed variable declarations.
* fCMatrix.cc (FloatComplexMatrix::utsolve,
FloatComplexMatrix::ltsolve): Likewise.
* fMatrix.cc (FloatMatrix::utsolve, FloatMatrix::ltsolve): Likewise.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 31 Dec 2014 15:57:37 -0500 |
| parents | dec5b96ca298 |
| children | d8fd3842a507 |
| files | liboctave/array/CMatrix.cc liboctave/array/dMatrix.cc liboctave/array/fCMatrix.cc liboctave/array/fMatrix.cc |
| diffstat | 4 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/CMatrix.cc Thu Jan 01 18:52:35 2015 -0800 +++ b/liboctave/array/CMatrix.cc Wed Dec 31 15:57:37 2014 -0500 @@ -1973,8 +1973,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'U'; - char dia = 'N'; + uplo = 'U'; + dia = 'N'; Array<Complex> z (dim_vector (2 * nc, 1)); Complex *pz = z.fortran_vec (); @@ -2069,8 +2069,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'L'; - char dia = 'N'; + uplo = 'L'; + dia = 'N'; Array<Complex> z (dim_vector (2 * nc, 1)); Complex *pz = z.fortran_vec ();
--- a/liboctave/array/dMatrix.cc Thu Jan 01 18:52:35 2015 -0800 +++ b/liboctave/array/dMatrix.cc Wed Dec 31 15:57:37 2014 -0500 @@ -1612,8 +1612,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'U'; - char dia = 'N'; + uplo = 'U'; + dia = 'N'; Array<double> z (dim_vector (3 * nc, 1)); double *pz = z.fortran_vec (); @@ -1707,8 +1707,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'L'; - char dia = 'N'; + uplo = 'L'; + dia = 'N'; Array<double> z (dim_vector (3 * nc, 1)); double *pz = z.fortran_vec ();
--- a/liboctave/array/fCMatrix.cc Thu Jan 01 18:52:35 2015 -0800 +++ b/liboctave/array/fCMatrix.cc Wed Dec 31 15:57:37 2014 -0500 @@ -1977,8 +1977,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'U'; - char dia = 'N'; + uplo = 'U'; + dia = 'N'; Array<FloatComplex> z (dim_vector (2 * nc, 1)); FloatComplex *pz = z.fortran_vec (); @@ -2073,8 +2073,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'L'; - char dia = 'N'; + uplo = 'L'; + dia = 'N'; Array<FloatComplex> z (dim_vector (2 * nc, 1)); FloatComplex *pz = z.fortran_vec ();
--- a/liboctave/array/fMatrix.cc Thu Jan 01 18:52:35 2015 -0800 +++ b/liboctave/array/fMatrix.cc Wed Dec 31 15:57:37 2014 -0500 @@ -1624,8 +1624,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'U'; - char dia = 'N'; + uplo = 'U'; + dia = 'N'; Array<float> z (dim_vector (3 * nc, 1)); float *pz = z.fortran_vec (); @@ -1721,8 +1721,8 @@ if (calc_cond) { char norm = '1'; - char uplo = 'L'; - char dia = 'N'; + uplo = 'L'; + dia = 'N'; Array<float> z (dim_vector (3 * nc, 1)); float *pz = z.fortran_vec ();