GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some shadow warnings

Browse Source
This commit is contained in:
Christoph Hertzberg 2018-08-25 09:06:08 +02:00
parent f155e97adb
commit 117bc5d505
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unsupported/Eigen/src/Splines/Spline.h
View File

@ -249,8 +249,6 @@ namespace Eigen
DenseIndex degree, DenseIndex degree,
const typename Spline<_Scalar, _Dim, _Degree>::KnotVectorType& knots) const typename Spline<_Scalar, _Dim, _Degree>::KnotVectorType& knots)
{ {
typedef typename Spline<_Scalar, _Dim, _Degree>::BasisVectorType BasisVectorType;
const DenseIndex p = degree; const DenseIndex p = degree;
const DenseIndex i = Spline::Span(u, degree, knots); const DenseIndex i = Spline::Span(u, degree, knots);
@ -380,9 +378,6 @@ namespace Eigen
typedef Spline<_Scalar, _Dim, _Degree> SplineType; typedef Spline<_Scalar, _Dim, _Degree> SplineType;
enum { Order = SplineTraits<SplineType>::OrderAtCompileTime }; enum { Order = SplineTraits<SplineType>::OrderAtCompileTime };
typedef typename SplineTraits<SplineType>::Scalar Scalar;
typedef typename SplineTraits<SplineType>::BasisVectorType BasisVectorType;
const DenseIndex span = SplineType::Span(u, p, U); const DenseIndex span = SplineType::Span(u, p, U);
const DenseIndex n = (std::min)(p, order); const DenseIndex n = (std::min)(p, order);

12
unsupported/test/matrix_function.cpp
View File

@ -23,9 +23,8 @@ inline bool test_isApprox_abs(const Type1& a, const Type2& b)
// Returns a matrix with eigenvalues clustered around 0, 1 and 2. // Returns a matrix with eigenvalues clustered around 0, 1 and 2.
template<typename MatrixType> template<typename MatrixType>
MatrixType randomMatrixWithRealEivals(const typename MatrixType::Index size) MatrixType randomMatrixWithRealEivals(const Index size)
{ {
typedef typename MatrixType::Index Index;
typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar; typedef typename MatrixType::RealScalar RealScalar;
MatrixType diag = MatrixType::Zero(size, size); MatrixType diag = MatrixType::Zero(size, size);
@ -42,16 +41,15 @@ template <typename MatrixType, int IsComplex = NumTraits<typename internal::trai
struct randomMatrixWithImagEivals struct randomMatrixWithImagEivals
{ {
// Returns a matrix with eigenvalues clustered around 0 and +/- i. // Returns a matrix with eigenvalues clustered around 0 and +/- i.
static MatrixType run(const typename MatrixType::Index size); static MatrixType run(const Index size);
}; };
// Partial specialization for real matrices // Partial specialization for real matrices
template<typename MatrixType> template<typename MatrixType>
struct randomMatrixWithImagEivals<MatrixType, 0> struct randomMatrixWithImagEivals<MatrixType, 0>
{ {
static MatrixType run(const typename MatrixType::Index size) static MatrixType run(const Index size)
{ {
typedef typename MatrixType::Index Index;
typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Scalar Scalar;
MatrixType diag = MatrixType::Zero(size, size); MatrixType diag = MatrixType::Zero(size, size);
Index i = 0; Index i = 0;
@ -77,9 +75,8 @@ struct randomMatrixWithImagEivals<MatrixType, 0>
template<typename MatrixType> template<typename MatrixType>
struct randomMatrixWithImagEivals<MatrixType, 1> struct randomMatrixWithImagEivals<MatrixType, 1>
{ {
static MatrixType run(const typename MatrixType::Index size) static MatrixType run(const Index size)
{ {
typedef typename MatrixType::Index Index;
typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar; typedef typename MatrixType::RealScalar RealScalar;
const Scalar imagUnit(0, 1); const Scalar imagUnit(0, 1);
@ -171,7 +168,6 @@ void testMatrixType(const MatrixType& m)
{ {
// Matrices with clustered eigenvalue lead to different code paths // Matrices with clustered eigenvalue lead to different code paths
// in MatrixFunction.h and are thus useful for testing. // in MatrixFunction.h and are thus useful for testing.
typedef typename MatrixType::Index Index;
const Index size = m.rows(); const Index size = m.rows();
for (int i = 0; i < g_repeat; i++) { for (int i = 0; i < g_repeat; i++) {

4
unsupported/test/openglsupport.cpp
View File

@ -318,10 +318,6 @@ EIGEN_DECLARE_TEST(openglsupport)
GLint prg_id = createShader(vtx,frg); GLint prg_id = createShader(vtx,frg);
typedef Vector2d Vector2d;
typedef Vector3d Vector3d;
typedef Vector4d Vector4d;
VERIFY_UNIFORM(dv,v2d, Vector2d); VERIFY_UNIFORM(dv,v2d, Vector2d);
VERIFY_UNIFORM(dv,v3d, Vector3d); VERIFY_UNIFORM(dv,v3d, Vector3d);
VERIFY_UNIFORM(dv,v4d, Vector4d); VERIFY_UNIFORM(dv,v4d, Vector4d);

1
unsupported/test/polynomialsolver.cpp
View File

@ -30,7 +30,6 @@ struct increment_if_fixed_size
template<int Deg, typename POLYNOMIAL, typename SOLVER> template<int Deg, typename POLYNOMIAL, typename SOLVER>
bool aux_evalSolver( const POLYNOMIAL& pols, SOLVER& psolve ) bool aux_evalSolver( const POLYNOMIAL& pols, SOLVER& psolve )
{ {
typedef typename POLYNOMIAL::Index Index;
typedef typename POLYNOMIAL::Scalar Scalar; typedef typename POLYNOMIAL::Scalar Scalar;
typedef typename POLYNOMIAL::RealScalar RealScalar; typedef typename POLYNOMIAL::RealScalar RealScalar;