bug #1596: fix inclusion of Eigen's header within unsupported modules.

This commit is contained in:
Gael Guennebaud 2018-09-17 09:54:29 +02:00
parent 72f19c827a
commit b311bfb752
24 changed files with 52 additions and 52 deletions

View File

@ -40,7 +40,7 @@
# undef realloc # undef realloc
#endif #endif
#include <Eigen/Core> #include "../../Eigen/Core"
namespace Eigen { namespace Eigen {

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_ALIGNED_VECTOR3 #ifndef EIGEN_ALIGNED_VECTOR3
#define EIGEN_ALIGNED_VECTOR3 #define EIGEN_ALIGNED_VECTOR3
#include <Eigen/Geometry> #include "../../Eigen/Geometry"
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h" #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"

View File

@ -9,7 +9,7 @@
#ifndef EIGEN_ARPACKSUPPORT_MODULE_H #ifndef EIGEN_ARPACKSUPPORT_MODULE_H
#define EIGEN_ARPACKSUPPORT_MODULE_H #define EIGEN_ARPACKSUPPORT_MODULE_H
#include <Eigen/Core> #include "../../Eigen/Core"
/** \defgroup ArpackSupport_Module Arpack support module /** \defgroup ArpackSupport_Module Arpack support module
* *
@ -20,12 +20,12 @@
* \endcode * \endcode
*/ */
#include <Eigen/SparseCholesky> #include "../../Eigen/SparseCholesky"
#include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/Eigenvalues/ArpackSelfAdjointEigenSolver.h" #include "src/Eigenvalues/ArpackSelfAdjointEigenSolver.h"
#include <Eigen/src/Core/util/ReenableStupidWarnings.h> #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_ARPACKSUPPORT_MODULE_H #endif // EIGEN_ARPACKSUPPORT_MODULE_H
/* vim: set filetype=cpp et sw=2 ts=2 ai: */ /* vim: set filetype=cpp et sw=2 ts=2 ai: */

View File

@ -10,9 +10,9 @@
#ifndef EIGEN_BVH_MODULE_H #ifndef EIGEN_BVH_MODULE_H
#define EIGEN_BVH_MODULE_H #define EIGEN_BVH_MODULE_H
#include <Eigen/Core> #include "../../Eigen/Core"
#include <Eigen/Geometry> #include "../../Eigen/Geometry"
#include <Eigen/StdVector> #include "../../Eigen/StdVector"
#include <algorithm> #include <algorithm>
#include <queue> #include <queue>

View File

@ -28,7 +28,7 @@
#include "../SpecialFunctions" #include "../SpecialFunctions"
#include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/util/CXX11Meta.h" #include "src/util/CXX11Meta.h"
#include "src/util/MaxSizeVector.h" #include "src/util/MaxSizeVector.h"
@ -160,6 +160,6 @@ typedef unsigned __int64 uint64_t;
#include "src/Tensor/TensorIO.h" #include "src/Tensor/TensorIO.h"
#include <Eigen/src/Core/util/ReenableStupidWarnings.h> #include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h"
//#endif // EIGEN_CXX11_TENSOR_MODULE //#endif // EIGEN_CXX11_TENSOR_MODULE

View File

@ -10,9 +10,9 @@
#ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE #ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE
#define EIGEN_CXX11_TENSORSYMMETRY_MODULE #define EIGEN_CXX11_TENSORSYMMETRY_MODULE
#include <unsupported/Eigen/CXX11/Tensor> #include "Tensor"
#include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "src/util/CXX11Meta.h" #include "src/util/CXX11Meta.h"
@ -33,7 +33,7 @@
#include "src/TensorSymmetry/StaticSymmetry.h" #include "src/TensorSymmetry/StaticSymmetry.h"
#include "src/TensorSymmetry/DynamicSymmetry.h" #include "src/TensorSymmetry/DynamicSymmetry.h"
#include <Eigen/src/Core/util/ReenableStupidWarnings.h> #include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_CXX11_TENSORSYMMETRY_MODULE #endif // EIGEN_CXX11_TENSORSYMMETRY_MODULE

View File

@ -12,7 +12,7 @@
#include "../../../Eigen/Core" #include "../../../Eigen/Core"
#include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../../../Eigen/src/Core/util/DisableStupidWarnings.h"
/** \defgroup CXX11_ThreadPool_Module C++11 ThreadPool Module /** \defgroup CXX11_ThreadPool_Module C++11 ThreadPool Module
* *
@ -69,6 +69,6 @@
#endif #endif
#include <Eigen/src/Core/util/ReenableStupidWarnings.h> #include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_CXX11_THREADPOOL_MODULE #endif // EIGEN_CXX11_THREADPOOL_MODULE

View File

@ -11,10 +11,10 @@
#define EIGEN_EULERANGLES_MODULE_H #define EIGEN_EULERANGLES_MODULE_H
#include "Eigen/Core" #include "../../Eigen/Core"
#include "Eigen/Geometry" #include "../../Eigen/Geometry"
#include "Eigen/src/Core/util/DisableStupidWarnings.h" #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
namespace Eigen { namespace Eigen {
@ -38,6 +38,6 @@ namespace Eigen {
#include "src/EulerAngles/EulerSystem.h" #include "src/EulerAngles/EulerSystem.h"
#include "src/EulerAngles/EulerAngles.h" #include "src/EulerAngles/EulerAngles.h"
#include "Eigen/src/Core/util/ReenableStupidWarnings.h" #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_EULERANGLES_MODULE_H #endif // EIGEN_EULERANGLES_MODULE_H

View File

@ -13,7 +13,7 @@
#include <complex> #include <complex>
#include <vector> #include <vector>
#include <map> #include <map>
#include <Eigen/Core> #include "../../Eigen/Core"
/** /**

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_ITERATIVE_SOLVERS_MODULE_H #ifndef EIGEN_ITERATIVE_SOLVERS_MODULE_H
#define EIGEN_ITERATIVE_SOLVERS_MODULE_H #define EIGEN_ITERATIVE_SOLVERS_MODULE_H
#include <Eigen/Sparse> #include "../../Eigen/Sparse"
#include "../../Eigen/Jacobi" #include "../../Eigen/Jacobi"
#include "../../Eigen/Householder" #include "../../Eigen/Householder"

View File

@ -12,12 +12,12 @@
// #include <vector> // #include <vector>
#include <Eigen/Core> #include "../../Eigen/Core"
#include <Eigen/Jacobi> #include "../../Eigen/Jacobi"
#include <Eigen/QR> #include "../../Eigen/QR"
#include <unsupported/Eigen/NumericalDiff> #include "NumericalDiff"
#include <Eigen/SparseQR> #include "../../Eigen/SparseQR"
/** /**
* \defgroup LevenbergMarquardt_Module Levenberg-Marquardt module * \defgroup LevenbergMarquardt_Module Levenberg-Marquardt module
@ -29,7 +29,7 @@
* *
*/ */
#include "Eigen/SparseCore" #include "../../Eigen/SparseCore"
#include "../../Eigen/src/Core/util/DisableStupidWarnings.h" #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"

View File

@ -12,7 +12,7 @@
#ifndef EIGEN_MPREALSUPPORT_MODULE_H #ifndef EIGEN_MPREALSUPPORT_MODULE_H
#define EIGEN_MPREALSUPPORT_MODULE_H #define EIGEN_MPREALSUPPORT_MODULE_H
#include <Eigen/Core> #include "../../Eigen/Core"
#include <mpreal.h> #include <mpreal.h>
namespace Eigen { namespace Eigen {

View File

@ -14,9 +14,9 @@
#include <cfloat> #include <cfloat>
#include <list> #include <list>
#include <Eigen/Core> #include "../../Eigen/Core"
#include <Eigen/LU> #include "../../Eigen/LU"
#include <Eigen/Eigenvalues> #include "../../Eigen/Eigenvalues"
/** /**
* \defgroup MatrixFunctions_Module Matrix functions module * \defgroup MatrixFunctions_Module Matrix functions module

View File

@ -9,7 +9,7 @@
#ifndef EIGEN_MOREVECTORIZATION_MODULE_H #ifndef EIGEN_MOREVECTORIZATION_MODULE_H
#define EIGEN_MOREVECTORIZATION_MODULE_H #define EIGEN_MOREVECTORIZATION_MODULE_H
#include <Eigen/Core> #include "../../Eigen/Core"
namespace Eigen { namespace Eigen {

View File

@ -12,10 +12,10 @@
#include <vector> #include <vector>
#include <Eigen/Core> #include "../../Eigen/Core"
#include <Eigen/Jacobi> #include "../../Eigen/Jacobi"
#include <Eigen/QR> #include "../../Eigen/QR"
#include <unsupported/Eigen/NumericalDiff> #include "NumericalDiff"
/** /**
* \defgroup NonLinearOptimization_Module Non linear optimization module * \defgroup NonLinearOptimization_Module Non linear optimization module

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_NUMERICALDIFF_MODULE #ifndef EIGEN_NUMERICALDIFF_MODULE
#define EIGEN_NUMERICALDIFF_MODULE #define EIGEN_NUMERICALDIFF_MODULE
#include <Eigen/Core> #include "../../Eigen/Core"
namespace Eigen { namespace Eigen {

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_OPENGL_MODULE #ifndef EIGEN_OPENGL_MODULE
#define EIGEN_OPENGL_MODULE #define EIGEN_OPENGL_MODULE
#include <Eigen/Geometry> #include "../../Eigen/Geometry"
#if defined(__APPLE_CC__) #if defined(__APPLE_CC__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>

View File

@ -9,11 +9,11 @@
#ifndef EIGEN_POLYNOMIALS_MODULE_H #ifndef EIGEN_POLYNOMIALS_MODULE_H
#define EIGEN_POLYNOMIALS_MODULE_H #define EIGEN_POLYNOMIALS_MODULE_H
#include <Eigen/Core> #include "../../Eigen/Core"
#include <Eigen/Eigenvalues> #include "../../Eigen/Eigenvalues"
#include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
// Note that EIGEN_HIDE_HEAVY_CODE has to be defined per module // Note that EIGEN_HIDE_HEAVY_CODE has to be defined per module
#if (defined EIGEN_EXTERN_INSTANTIATIONS) && (EIGEN_EXTERN_INSTANTIATIONS>=2) #if (defined EIGEN_EXTERN_INSTANTIATIONS) && (EIGEN_EXTERN_INSTANTIATIONS>=2)
@ -132,7 +132,7 @@
Output: \verbinclude PolynomialSolver1.out Output: \verbinclude PolynomialSolver1.out
*/ */
#include <Eigen/src/Core/util/ReenableStupidWarnings.h> #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_POLYNOMIALS_MODULE_H #endif // EIGEN_POLYNOMIALS_MODULE_H
/* vim: set filetype=cpp et sw=2 ts=2 ai: */ /* vim: set filetype=cpp et sw=2 ts=2 ai: */

View File

@ -10,9 +10,9 @@
#define EIGEN_SKYLINE_MODULE_H #define EIGEN_SKYLINE_MODULE_H
#include "Eigen/Core" #include "../../Eigen/Core"
#include "Eigen/src/Core/util/DisableStupidWarnings.h" #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include <map> #include <map>
#include <cstdlib> #include <cstdlib>
@ -34,6 +34,6 @@
#include "src/Skyline/SkylineInplaceLU.h" #include "src/Skyline/SkylineInplaceLU.h"
#include "src/Skyline/SkylineProduct.h" #include "src/Skyline/SkylineProduct.h"
#include "Eigen/src/Core/util/ReenableStupidWarnings.h" #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
#endif // EIGEN_SKYLINE_MODULE_H #endif // EIGEN_SKYLINE_MODULE_H

View File

@ -25,7 +25,7 @@
#ifndef EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H #ifndef EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H
#define EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H #define EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H
#include <Eigen/Dense> #include "../../../../Eigen/Dense"
namespace Eigen { namespace Eigen {

View File

@ -31,7 +31,7 @@
#ifndef EIGEN_CONSTRAINEDCG_H #ifndef EIGEN_CONSTRAINEDCG_H
#define EIGEN_CONSTRAINEDCG_H #define EIGEN_CONSTRAINEDCG_H
#include <Eigen/Core> #include "../../../../Eigen/Core"
namespace Eigen { namespace Eigen {

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_DGMRES_H #ifndef EIGEN_DGMRES_H
#define EIGEN_DGMRES_H #define EIGEN_DGMRES_H
#include <Eigen/Eigenvalues> #include "../../../../Eigen/Eigenvalues"
namespace Eigen { namespace Eigen {

View File

@ -17,8 +17,8 @@
#include "SplineFwd.h" #include "SplineFwd.h"
#include <Eigen/LU> #include "../../../../Eigen/LU"
#include <Eigen/QR> #include "../../../../Eigen/QR"
namespace Eigen namespace Eigen
{ {

View File

@ -10,7 +10,7 @@
#ifndef EIGEN_SPLINES_FWD_H #ifndef EIGEN_SPLINES_FWD_H
#define EIGEN_SPLINES_FWD_H #define EIGEN_SPLINES_FWD_H
#include <Eigen/Core> #include "../../../../Eigen/Core"
namespace Eigen namespace Eigen
{ {