From 4c3f8d09e33f73ad4cb9850704f33f8713d5dac4 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 3 Nov 2011 01:57:13 +0100
Subject: [PATCH] Clean up #includes
---
dune/tectonic/globalnonlinearity.hh | 4 ++--
dune/tectonic/localnonlinearity.hh | 4 ++--
dune/tectonic/myblockproblem.hh | 1 -
dune/tectonic/myconvexproblem.hh | 4 ++--
dune/tectonic/nicefunction.hh | 4 ++--
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index c1224d6e..5a2f5826 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -3,9 +3,9 @@
#ifndef DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
#define DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
-//#include <dune/common/bitsetvector.hh>
#include <dune/common/fvector.hh>
-#include <dune/tectonic/localnonlinearity.hh>
+
+#include "localnonlinearity.hh"
namespace Dune {
template <int dim, class OuterFunctionType> class GlobalNonlinearity {
diff --git a/dune/tectonic/localnonlinearity.hh b/dune/tectonic/localnonlinearity.hh
index 7c7b3a5c..0f182ef2 100644
--- a/dune/tectonic/localnonlinearity.hh
+++ b/dune/tectonic/localnonlinearity.hh
@@ -3,13 +3,13 @@
#ifndef DUNE_TECTONIC_LOCAL_NONLINEARITY_HH
#define DUNE_TECTONIC_LOCAL_NONLINEARITY_HH
+#include <limits>
+
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/fufem/interval.hh>
-#include <limits>
-
#include "nicefunction.hh"
namespace Dune {
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 7c3a9882..aba33a61 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -3,7 +3,6 @@
#ifndef MY_BLOCK_PROBLEM_HH
#define MY_BLOCK_PROBLEM_HH
-// #include <dune/common/parametertree.hh>
#include <dune/common/bitsetvector.hh>
#include <dune/tnnmg/problem-classes/bisection.hh>
diff --git a/dune/tectonic/myconvexproblem.hh b/dune/tectonic/myconvexproblem.hh
index 7d7302f0..27de143f 100644
--- a/dune/tectonic/myconvexproblem.hh
+++ b/dune/tectonic/myconvexproblem.hh
@@ -1,10 +1,10 @@
// Based on dune/tnnmg/problem-classes/convexproblem.hh
-#include <dune/tectonic/globalnonlinearity.hh>
-
#ifndef MY_CONVEX_PROBLEM_HH
#define MY_CONVEX_PROBLEM_HH
+#include "globalnonlinearity.hh"
+
/** \brief TODO
\tparam MatrixTypeTEMPLATE The type used for the matrix of the quadratic
diff --git a/dune/tectonic/nicefunction.hh b/dune/tectonic/nicefunction.hh
index fecc7dd9..81f3894c 100644
--- a/dune/tectonic/nicefunction.hh
+++ b/dune/tectonic/nicefunction.hh
@@ -3,10 +3,10 @@
#ifndef NICE_FUNCTION_HH
#define NICE_FUNCTION_HH
-#include <dune/common/function.hh>
-
#include <cmath>
+#include <dune/common/function.hh>
+
namespace Dune {
class NiceFunction : public VirtualFunction<double, double> {
public:
--
GitLab