From 9b8618088929f6de5f5eb8a76e4fdb57bb9f7a08 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@uni-muenster.de>
Date: Thu, 18 Jan 2018 10:36:22 +0100
Subject: [PATCH] disable warnings from Eigen includes
---
dune/xt/la/container/eigen/base.hh | 2 ++
dune/xt/la/eigen-solver/internal/eigen.hh | 2 ++
dune/xt/la/eigen-solver/internal/lapacke.hh | 2 +-
dune/xt/la/matrix-inverter/internal/eigen.hh | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dune/xt/la/container/eigen/base.hh b/dune/xt/la/container/eigen/base.hh
index b04c4b8b8..27d6b6a0a 100644
--- a/dune/xt/la/container/eigen/base.hh
+++ b/dune/xt/la/container/eigen/base.hh
@@ -20,7 +20,9 @@
#include <mutex>
#if HAVE_EIGEN
+#include <dune/xt/common/disable_warnings.hh>
#include <Eigen/Core>
+#include <dune/xt/common/reenable_warnings.hh>
#endif
#include <dune/common/typetraits.hh>
diff --git a/dune/xt/la/eigen-solver/internal/eigen.hh b/dune/xt/la/eigen-solver/internal/eigen.hh
index 9bac8d6bc..bb5c00f22 100644
--- a/dune/xt/la/eigen-solver/internal/eigen.hh
+++ b/dune/xt/la/eigen-solver/internal/eigen.hh
@@ -13,8 +13,10 @@
#include <vector>
#if HAVE_EIGEN
+#include <dune/xt/common/disable_warnings.hh>
#include <Eigen/Core>
#include <Eigen/Eigenvalues>
+#include <dune/xt/common/reenable_warnings.hh>
#endif
#include <dune/common/typetraits.hh>
diff --git a/dune/xt/la/eigen-solver/internal/lapacke.hh b/dune/xt/la/eigen-solver/internal/lapacke.hh
index e35f2858d..32e447d57 100644
--- a/dune/xt/la/eigen-solver/internal/lapacke.hh
+++ b/dune/xt/la/eigen-solver/internal/lapacke.hh
@@ -105,7 +105,7 @@ compute_eigenvalues_and_right_eigenvectors_of_a_real_matrix_using_lapack(
static_assert(std::is_same<Dune::XT::Common::real_t<complex_type>, double>::value,
"You have to manually convert the eigenvaluematrix to something else outside!");
const size_t size = Dune::XT::Common::get_matrix_rows(serializable_matrix);
-#if DUNE_XT_LA_DISABLE_ALL_CHECKS
+#ifdef DUNE_XT_LA_DISABLE_ALL_CHECKS
assert(Dune::XT::Common::get_matrix_cols(serializable_matrix) == size);
assert(Dune::XT::Common::get_matrix_rows(right_eigenvectors) == size);
assert(Dune::XT::Common::get_matrix_cols(right_eigenvectors) == size);
diff --git a/dune/xt/la/matrix-inverter/internal/eigen.hh b/dune/xt/la/matrix-inverter/internal/eigen.hh
index 12126e80e..ff480f1ae 100644
--- a/dune/xt/la/matrix-inverter/internal/eigen.hh
+++ b/dune/xt/la/matrix-inverter/internal/eigen.hh
@@ -13,8 +13,10 @@
#include <limits>
#if HAVE_EIGEN
+#include <dune/xt/common/disable_warnings.hh>
#include <Eigen/Core>
#include <Eigen/SVD>
+#include <dune/xt/common/reenable_warnings.hh>
#endif
#include <dune/common/typetraits.hh>
--
GitLab