From 2316b6ea5738bbb02b2c9ac85bf0ce9e366e9e9a Mon Sep 17 00:00:00 2001 From: koldo Date: Tue, 9 Apr 2019 06:45:57 +0000 Subject: [PATCH] *Eigen: Fixed some include problems that appear when compiling in Linux using Makefile git-svn-id: svn://ultimatepp.org/upp/trunk@12975 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/plugin/Eigen/unsupported/Eigen/CXX11/Tensor | 4 ++-- uppsrc/plugin/Eigen/unsupported/Eigen/FFT | 2 +- .../plugin/Eigen/unsupported/Eigen/NonLinearOptimization | 8 ++++---- uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/uppsrc/plugin/Eigen/unsupported/Eigen/CXX11/Tensor b/uppsrc/plugin/Eigen/unsupported/Eigen/CXX11/Tensor index bb6523d15..0694aee0b 100644 --- a/uppsrc/plugin/Eigen/unsupported/Eigen/CXX11/Tensor +++ b/uppsrc/plugin/Eigen/unsupported/Eigen/CXX11/Tensor @@ -25,7 +25,7 @@ #include #endif -#include +#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" #include "../SpecialFunctions" #include "src/util/CXX11Meta.h" @@ -149,6 +149,6 @@ typedef unsigned __int64 uint64_t; #include "src/Tensor/TensorIO.h" -#include +#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h" //#endif // EIGEN_CXX11_TENSOR_MODULE diff --git a/uppsrc/plugin/Eigen/unsupported/Eigen/FFT b/uppsrc/plugin/Eigen/unsupported/Eigen/FFT index d8cf3e642..332098ad3 100644 --- a/uppsrc/plugin/Eigen/unsupported/Eigen/FFT +++ b/uppsrc/plugin/Eigen/unsupported/Eigen/FFT @@ -13,7 +13,7 @@ #include #include #include -#include +#include "../../Eigen/Core" /** diff --git a/uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization b/uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization index 600ab4c12..f6f9c35c7 100644 --- a/uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization +++ b/uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization @@ -12,10 +12,10 @@ #include -#include -#include -#include -#include +#include "../../Eigen/Core" +#include "../../Eigen/Jacobi" +#include "../../Eigen/QR" +#include "../../unsupported/Eigen/NumericalDiff" /** * \defgroup NonLinearOptimization_Module Non linear optimization module diff --git a/uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff b/uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff index 433334ca8..0668f960f 100644 --- a/uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff +++ b/uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff @@ -10,7 +10,7 @@ #ifndef EIGEN_NUMERICALDIFF_MODULE #define EIGEN_NUMERICALDIFF_MODULE -#include +#include "../../Eigen/Core" namespace Eigen {