fix some legitimate shadow warnings

This commit is contained in:
Gael Guennebaud 2015-06-09 15:17:58 +02:00
parent f9350e70eb
commit d4c574707e
3 changed files with 11 additions and 11 deletions

View File

@ -351,8 +351,8 @@ int EIGEN_BLAS_FUNC(tbsv)(char *uplo, char *op, char *diag, int *n, int *k, Real
static bool init = false;
if(!init)
{
for(int k=0; k<16; ++k)
func[k] = 0;
for(int i=0; i<16; ++i)
func[i] = 0;
func[NOTR | (UP << 2) | (NUNIT << 3)] = (internal::band_solve_triangular_selector<int,Upper|0, Scalar,false,Scalar,ColMajor>::run);
func[TR | (UP << 2) | (NUNIT << 3)] = (internal::band_solve_triangular_selector<int,Lower|0, Scalar,false,Scalar,RowMajor>::run);

View File

@ -18,8 +18,8 @@ int EIGEN_BLAS_FUNC(gemm)(char *opa, char *opb, int *m, int *n, int *k, RealScal
static bool init = false;
if(!init)
{
for(int k=0; k<12; ++k)
func[k] = 0;
for(int i=0; i<12; ++i)
func[i] = 0;
func[NOTR | (NOTR << 2)] = (internal::general_matrix_matrix_product<DenseIndex,Scalar,ColMajor,false,Scalar,ColMajor,false,ColMajor>::run);
func[TR | (NOTR << 2)] = (internal::general_matrix_matrix_product<DenseIndex,Scalar,RowMajor,false,Scalar,ColMajor,false,ColMajor>::run);
func[ADJ | (NOTR << 2)] = (internal::general_matrix_matrix_product<DenseIndex,Scalar,RowMajor,Conj, Scalar,ColMajor,false,ColMajor>::run);
@ -72,8 +72,8 @@ int EIGEN_BLAS_FUNC(trsm)(char *side, char *uplo, char *opa, char *diag, int *m,
static bool init = false;
if(!init)
{
for(int k=0; k<32; ++k)
func[k] = 0;
for(int i=0; i<32; ++i)
func[i] = 0;
func[NOTR | (LEFT << 2) | (UP << 3) | (NUNIT << 4)] = (internal::triangular_solve_matrix<Scalar,DenseIndex,OnTheLeft, Upper|0, false,ColMajor,ColMajor>::run);
func[TR | (LEFT << 2) | (UP << 3) | (NUNIT << 4)] = (internal::triangular_solve_matrix<Scalar,DenseIndex,OnTheLeft, Lower|0, false,RowMajor,ColMajor>::run);
@ -312,8 +312,8 @@ int EIGEN_BLAS_FUNC(syrk)(char *uplo, char *op, int *n, int *k, RealScalar *palp
static bool init = false;
if(!init)
{
for(int k=0; k<8; ++k)
func[k] = 0;
for(int i=0; i<8; ++i)
func[i] = 0;
func[NOTR | (UP << 2)] = (internal::general_matrix_matrix_triangular_product<DenseIndex,Scalar,ColMajor,false,Scalar,RowMajor,ColMajor,Conj, Upper>::run);
func[TR | (UP << 2)] = (internal::general_matrix_matrix_triangular_product<DenseIndex,Scalar,RowMajor,false,Scalar,ColMajor,ColMajor,Conj, Upper>::run);
@ -506,8 +506,8 @@ int EIGEN_BLAS_FUNC(herk)(char *uplo, char *op, int *n, int *k, RealScalar *palp
static bool init = false;
if(!init)
{
for(int k=0; k<8; ++k)
func[k] = 0;
for(int i=0; i<8; ++i)
func[i] = 0;
func[NOTR | (UP << 2)] = (internal::general_matrix_matrix_triangular_product<DenseIndex,Scalar,ColMajor,false,Scalar,RowMajor,Conj, ColMajor,Upper>::run);
func[ADJ | (UP << 2)] = (internal::general_matrix_matrix_triangular_product<DenseIndex,Scalar,RowMajor,Conj, Scalar,ColMajor,false,ColMajor,Upper>::run);

View File

@ -471,7 +471,7 @@ namespace Eigen
r = p;
for (DenseIndex k=1; k<=static_cast<DenseIndex>(n); ++k)
{
for (DenseIndex j=p; j>=0; --j) N_(k,j) *= r;
for (j=p; j>=0; --j) N_(k,j) *= r;
r *= p-k;
}
}