diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-06-09 09:11:12 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-09 09:11:12 +0200 |
commit | 9a2447b0c95bb62bd3e5ae68bf14d2c5e66a18cf (patch) | |
tree | 40712813d830e39c1e8e5b32be7c46abf4c90695 /test | |
parent | cd8b996f99de67035a0504cbaf0a627fb68f0f1d (diff) |
Fix shadow warnings triggered by clang
Diffstat (limited to 'test')
-rw-r--r-- | test/inverse.cpp | 10 | ||||
-rw-r--r-- | test/sparse_solver.h | 1 | ||||
-rw-r--r-- | test/sparse_vector.cpp | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/test/inverse.cpp b/test/inverse.cpp index b09989aca..5c6777a18 100644 --- a/test/inverse.cpp +++ b/test/inverse.cpp @@ -71,11 +71,11 @@ template<typename MatrixType> void inverse(const MatrixType& m) // check with submatrices { - Matrix<Scalar, MatrixType::RowsAtCompileTime+1, MatrixType::RowsAtCompileTime+1, MatrixType::Options> m3; - m3.setRandom(); - m3.topLeftCorner(rows,rows) = m1; - m2 = m3.template topLeftCorner<MatrixType::RowsAtCompileTime,MatrixType::ColsAtCompileTime>().inverse(); - VERIFY_IS_APPROX( (m3.template topLeftCorner<MatrixType::RowsAtCompileTime,MatrixType::ColsAtCompileTime>()), m2.inverse() ); + Matrix<Scalar, MatrixType::RowsAtCompileTime+1, MatrixType::RowsAtCompileTime+1, MatrixType::Options> m5; + m5.setRandom(); + m5.topLeftCorner(rows,rows) = m1; + m2 = m5.template topLeftCorner<MatrixType::RowsAtCompileTime,MatrixType::ColsAtCompileTime>().inverse(); + VERIFY_IS_APPROX( (m5.template topLeftCorner<MatrixType::RowsAtCompileTime,MatrixType::ColsAtCompileTime>()), m2.inverse() ); } #endif diff --git a/test/sparse_solver.h b/test/sparse_solver.h index 418c18d6a..6ccc5487b 100644 --- a/test/sparse_solver.h +++ b/test/sparse_solver.h @@ -267,7 +267,6 @@ template<typename Solver> void check_sparse_spd_solving(Solver& solver) { if (it.sym() == SPD){ A = it.matrix(); - Mat halfA; DenseVector b = it.rhs(); DenseVector refX = it.refX(); PermutationMatrix<Dynamic, Dynamic, StorageIndex> pnull; diff --git a/test/sparse_vector.cpp b/test/sparse_vector.cpp index 5dc421976..d3975b99b 100644 --- a/test/sparse_vector.cpp +++ b/test/sparse_vector.cpp @@ -55,16 +55,16 @@ template<typename Scalar,typename Index> void sparse_vector(int rows, int cols) // test coeffRef with reallocation { - SparseVectorType v1(rows); - DenseVector v2 = DenseVector::Zero(rows); + SparseVectorType v4(rows); + DenseVector v5 = DenseVector::Zero(rows); for(int k=0; k<rows; ++k) { int i = internal::random<int>(0,rows-1); Scalar v = internal::random<Scalar>(); - v1.coeffRef(i) += v; - v2.coeffRef(i) += v; + v4.coeffRef(i) += v; + v5.coeffRef(i) += v; } - VERIFY_IS_APPROX(v1,v2); + VERIFY_IS_APPROX(v4,v5); } v1.coeffRef(nonzerocoords[0]) = Scalar(5); |