From a7cf67bd99569bafdb87bfd7475fe181780e539a Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 12 Jul 2013 15:57:54 +0000
Subject: [PATCH] Add missing #includes and namespace
[[Imported from SVN: r11790]]
---
.../iterationsteps/minimalpolynomialextrapolationstep.hh | 2 ++
dune/solvers/solvers/tcgsolver.hh | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dune/solvers/iterationsteps/minimalpolynomialextrapolationstep.hh b/dune/solvers/iterationsteps/minimalpolynomialextrapolationstep.hh
index 88f3fc64..2f6b152a 100644
--- a/dune/solvers/iterationsteps/minimalpolynomialextrapolationstep.hh
+++ b/dune/solvers/iterationsteps/minimalpolynomialextrapolationstep.hh
@@ -3,7 +3,9 @@
#include <dune/common/bitsetvector.hh>
+#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
+#include <dune/istl/preconditioners.hh>
#include <dune/istl/solvers.hh>
#include <dune/solvers/common/preconditioner.hh>
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 356cfb6d..6fa7bc0e 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -3,6 +3,7 @@
#include <cmath>
+#include <dune/common/misc.hh>
#include <dune/solvers/solvers/iterativesolver.hh>
#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/solvers/norms/norm.hh>
@@ -24,7 +25,7 @@ class TruncatedCGSolver : public IterativeSolver<VectorType>
field_type p = b/a;
field_type q = c/a;
- field_type root1 = - p/2 - sign(p) * std::sqrt(p*p/4 - q);
+ field_type root1 = - p/2 - Dune::sign(p) * std::sqrt(p*p/4 - q);
field_type root2 = q/root1;
// There must be one positive and one negative root
--
GitLab