Fix shadow warnings triggered by clang

This commit is contained in:
Gael Guennebaud
2015-06-09 09:11:12 +02:00
parent cd8b996f99
commit 9a2447b0c9
10 changed files with 38 additions and 35 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -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);