Fix numerous shadow-warnings for GCC<=4.8

This commit is contained in:
Christoph Hertzberg
2018-08-28 18:32:39 +02:00
parent ef4d79fed8
commit 73ca600bca
18 changed files with 58 additions and 11 deletions

View File

@@ -12,6 +12,8 @@
#include <Eigen/Geometry>
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
namespace Eigen {
/**
@@ -221,4 +223,6 @@ struct evaluator<AlignedVector3<Scalar> >
}
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_ALIGNED_VECTOR3

View File

@@ -28,11 +28,17 @@ namespace Eigen {
//@{
}
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/AutoDiff/AutoDiffScalar.h"
// #include "src/AutoDiff/AutoDiffVector.h"
#include "src/AutoDiff/AutoDiffJacobian.h"
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
namespace Eigen {
//@}
}

View File

@@ -26,9 +26,9 @@
#include <utility>
#endif
#include <Eigen/src/Core/util/DisableStupidWarnings.h>
#include "../SpecialFunctions"
#include <Eigen/src/Core/util/DisableStupidWarnings.h>
#include "src/util/CXX11Meta.h"
#include "src/util/MaxSizeVector.h"

View File

@@ -68,6 +68,8 @@
*/
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#ifdef EIGEN_FFTW_DEFAULT
// FFTW: faster, GPL -- incompatible with Eigen in LGPL form, bigger code size
# include <fftw3.h>
@@ -415,5 +417,8 @@ void fft_inv_proxy<T_SrcMat,T_FftIfc>::evalTo(T_DestMat& dst) const
}
}
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif
/* vim: set filetype=cpp et sw=2 ts=2 ai: */

View File

@@ -11,6 +11,8 @@
#define EIGEN_ITERATIVE_SOLVERS_MODULE_H
#include <Eigen/Sparse>
#include "../../Eigen/Jacobi"
#include "../../Eigen/Householder"
/**
* \defgroup IterativeSolvers_Module Iterative solvers module
@@ -24,19 +26,21 @@
*/
//@{
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#ifndef EIGEN_MPL2_ONLY
#include "src/IterativeSolvers/IterationController.h"
#include "src/IterativeSolvers/ConstrainedConjGrad.h"
#endif
#include "src/IterativeSolvers/IncompleteLU.h"
#include "../../Eigen/Jacobi"
#include "../../Eigen/Householder"
#include "src/IterativeSolvers/GMRES.h"
#include "src/IterativeSolvers/DGMRES.h"
//#include "src/IterativeSolvers/SSORPreconditioner.h"
#include "src/IterativeSolvers/MINRES.h"
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
//@}
#endif // EIGEN_ITERATIVE_SOLVERS_MODULE_H

View File

@@ -30,6 +30,9 @@
*/
#include "Eigen/SparseCore"
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#ifndef EIGEN_PARSED_BY_DOXYGEN
#include "src/LevenbergMarquardt/LMqrsolv.h"
@@ -41,5 +44,6 @@
#include "src/LevenbergMarquardt/LevenbergMarquardt.h"
#include "src/LevenbergMarquardt/LMonestep.h"
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_LEVENBERGMARQUARDT_MODULE

View File

@@ -53,12 +53,16 @@
*
*/
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/MatrixFunctions/MatrixExponential.h"
#include "src/MatrixFunctions/MatrixFunction.h"
#include "src/MatrixFunctions/MatrixSquareRoot.h"
#include "src/MatrixFunctions/MatrixLogarithm.h"
#include "src/MatrixFunctions/MatrixPower.h"
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
/**
\page matrixbaseextra_page

View File

@@ -24,8 +24,12 @@ namespace Eigen
*/
}
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/Splines/SplineFwd.h"
#include "src/Splines/Spline.h"
#include "src/Splines/SplineFitting.h"
#include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_SPLINES_MODULE_H

View File

@@ -24,7 +24,7 @@ struct Functor
int m_inputs, m_values;
Functor() : m_inputs(InputsAtCompileTime), m_values(ValuesAtCompileTime) {}
Functor(int inputs, int values) : m_inputs(inputs), m_values(values) {}
Functor(int inputs_, int values_) : m_inputs(inputs_), m_values(values_) {}
int inputs() const { return m_inputs; }
int values() const { return m_values; }

View File

@@ -44,7 +44,7 @@ struct TestFunc1
int m_inputs, m_values;
TestFunc1() : m_inputs(InputsAtCompileTime), m_values(ValuesAtCompileTime) {}
TestFunc1(int inputs, int values) : m_inputs(inputs), m_values(values) {}
TestFunc1(int inputs_, int values_) : m_inputs(inputs_), m_values(values_) {}
int inputs() const { return m_inputs; }
int values() const { return m_values; }

View File

@@ -9,7 +9,7 @@
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "../../test/sparse_solver.h"
#include <Eigen/src/IterativeSolvers/DGMRES.h>
#include <unsupported/Eigen/IterativeSolvers>
template<typename T> void test_dgmres_T()
{

View File

@@ -35,7 +35,7 @@ struct TestFunc1
int m_inputs, m_values;
TestFunc1() : m_inputs(InputsAtCompileTime), m_values(ValuesAtCompileTime) {}
TestFunc1(int inputs, int values) : m_inputs(inputs), m_values(values) {}
TestFunc1(int inputs_, int values_) : m_inputs(inputs_), m_values(values_) {}
int inputs() const { return m_inputs; }
int values() const { return m_values; }