From 0ef167bbd619c71d49ef1356e727994039a77d33 Mon Sep 17 00:00:00 2001 From: Simon Praetorius Date: Fri, 25 Sep 2020 00:00:14 +0200 Subject: [PATCH] unify config.h includes --- amdis/AMDiS.hpp | 4 +--- amdis/AdaptInfo.cpp | 4 +--- amdis/AdaptInstationary.cpp | 4 +--- amdis/AdaptStationary.cpp | 4 +--- amdis/Environment.cpp | 4 +--- amdis/Initfile.cpp | 4 +--- amdis/InitfileParser.cpp | 4 +--- amdis/ProblemInstat.cpp | 4 +--- amdis/ProblemInstatBase.cpp | 4 +--- amdis/ProblemStat.cpp | 4 +--- amdis/StandardProblemIteration.cpp | 4 +--- amdis/common/Filesystem.cpp | 4 +--- amdis/common/String.cpp | 4 +--- amdis/io/FileWriterBase.cpp | 3 ++- amdis/linearalgebra/istl/PreconCreator.cpp | 4 +--- amdis/linearalgebra/istl/SolverCreator.cpp | 4 +--- amdis/linearalgebra/istl/precompiled/Preconditioners.cpp | 4 +--- amdis/linearalgebra/istl/precompiled/Solvers.cpp | 4 +--- examples/boundary.cc | 5 ++--- examples/convection_diffusion.cc | 3 ++- examples/heat.cc | 5 ++--- examples/neumann.cc | 5 ++--- examples/periodic.cc | 5 ++--- examples/surface.cc | 1 - examples/vecellipt.cc | 4 +--- test/AdaptiveGridTest.cpp | 3 ++- test/DOFVectorTest.cpp | 2 +- test/DataTransferTest.hpp | 5 +---- test/ISTLCommTest.cpp | 2 +- test/OperatorsTest.cpp | 3 --- test/TreeContainerTest.cpp | 3 ++- 31 files changed, 37 insertions(+), 80 deletions(-) diff --git a/amdis/AMDiS.hpp b/amdis/AMDiS.hpp index cd8f6548..fee64176 100644 --- a/amdis/AMDiS.hpp +++ b/amdis/AMDiS.hpp @@ -1,8 +1,6 @@ #pragma once -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include diff --git a/amdis/AdaptInfo.cpp b/amdis/AdaptInfo.cpp index eabe3bfe..b8393e58 100644 --- a/amdis/AdaptInfo.cpp +++ b/amdis/AdaptInfo.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "AdaptInfo.hpp" diff --git a/amdis/AdaptInstationary.cpp b/amdis/AdaptInstationary.cpp index f5c4074e..f5417dee 100644 --- a/amdis/AdaptInstationary.cpp +++ b/amdis/AdaptInstationary.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "AdaptInstationary.hpp" diff --git a/amdis/AdaptStationary.cpp b/amdis/AdaptStationary.cpp index fb596bdc..2f5bb053 100644 --- a/amdis/AdaptStationary.cpp +++ b/amdis/AdaptStationary.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "AdaptStationary.hpp" diff --git a/amdis/Environment.cpp b/amdis/Environment.cpp index c024e3a4..1b8ad009 100644 --- a/amdis/Environment.cpp +++ b/amdis/Environment.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "Environment.hpp" diff --git a/amdis/Initfile.cpp b/amdis/Initfile.cpp index 1bae7e2a..4416b347 100644 --- a/amdis/Initfile.cpp +++ b/amdis/Initfile.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "Initfile.hpp" diff --git a/amdis/InitfileParser.cpp b/amdis/InitfileParser.cpp index 17a99d8f..5168fc04 100644 --- a/amdis/InitfileParser.cpp +++ b/amdis/InitfileParser.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "InitfileParser.hpp" diff --git a/amdis/ProblemInstat.cpp b/amdis/ProblemInstat.cpp index b98790c0..6957ed5b 100644 --- a/amdis/ProblemInstat.cpp +++ b/amdis/ProblemInstat.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "ProblemInstat.hpp" diff --git a/amdis/ProblemInstatBase.cpp b/amdis/ProblemInstatBase.cpp index cea43009..0f6a210c 100644 --- a/amdis/ProblemInstatBase.cpp +++ b/amdis/ProblemInstatBase.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "ProblemInstatBase.hpp" diff --git a/amdis/ProblemStat.cpp b/amdis/ProblemStat.cpp index d0397978..4582d114 100644 --- a/amdis/ProblemStat.cpp +++ b/amdis/ProblemStat.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "ProblemStat.hpp" diff --git a/amdis/StandardProblemIteration.cpp b/amdis/StandardProblemIteration.cpp index 5ab580f6..d3161c71 100644 --- a/amdis/StandardProblemIteration.cpp +++ b/amdis/StandardProblemIteration.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "StandardProblemIteration.hpp" diff --git a/amdis/common/Filesystem.cpp b/amdis/common/Filesystem.cpp index 6889d955..09a65123 100644 --- a/amdis/common/Filesystem.cpp +++ b/amdis/common/Filesystem.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "Filesystem.hpp" diff --git a/amdis/common/String.cpp b/amdis/common/String.cpp index 7b70d1d8..6efe1857 100644 --- a/amdis/common/String.cpp +++ b/amdis/common/String.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "String.hpp" diff --git a/amdis/io/FileWriterBase.cpp b/amdis/io/FileWriterBase.cpp index 3ebe75c2..e6273981 100644 --- a/amdis/io/FileWriterBase.cpp +++ b/amdis/io/FileWriterBase.cpp @@ -1,4 +1,5 @@ -#include "config.h" +#include + #include "FileWriterBase.hpp" #include diff --git a/amdis/linearalgebra/istl/PreconCreator.cpp b/amdis/linearalgebra/istl/PreconCreator.cpp index f62f069c..a88de341 100644 --- a/amdis/linearalgebra/istl/PreconCreator.cpp +++ b/amdis/linearalgebra/istl/PreconCreator.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "PreconCreator.hpp" #include "SolverCreator.hpp" diff --git a/amdis/linearalgebra/istl/SolverCreator.cpp b/amdis/linearalgebra/istl/SolverCreator.cpp index cdaf92b5..acf5aabb 100644 --- a/amdis/linearalgebra/istl/SolverCreator.cpp +++ b/amdis/linearalgebra/istl/SolverCreator.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "PreconCreator.hpp" #include "SolverCreator.hpp" diff --git a/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp b/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp index 3e453a89..7920097a 100644 --- a/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp +++ b/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "Preconditioners.hpp" diff --git a/amdis/linearalgebra/istl/precompiled/Solvers.cpp b/amdis/linearalgebra/istl/precompiled/Solvers.cpp index 881266a1..7d0c17ab 100644 --- a/amdis/linearalgebra/istl/precompiled/Solvers.cpp +++ b/amdis/linearalgebra/istl/precompiled/Solvers.cpp @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include "Solvers.hpp" diff --git a/examples/boundary.cc b/examples/boundary.cc index 1550062c..bbdda5b8 100644 --- a/examples/boundary.cc +++ b/examples/boundary.cc @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + #include #if HAVE_DUNE_SPGRID diff --git a/examples/convection_diffusion.cc b/examples/convection_diffusion.cc index 6019b151..cde56607 100644 --- a/examples/convection_diffusion.cc +++ b/examples/convection_diffusion.cc @@ -1,4 +1,5 @@ -#include "config.h" +#include + #include #include diff --git a/examples/heat.cc b/examples/heat.cc index d419d0dd..64c63517 100644 --- a/examples/heat.cc +++ b/examples/heat.cc @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + #include #include diff --git a/examples/neumann.cc b/examples/neumann.cc index d6d1c3de..6721f228 100644 --- a/examples/neumann.cc +++ b/examples/neumann.cc @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + #include #if HAVE_DUNE_SPGRID diff --git a/examples/periodic.cc b/examples/periodic.cc index 82bc8842..97079e27 100644 --- a/examples/periodic.cc +++ b/examples/periodic.cc @@ -1,6 +1,5 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + #include #if HAVE_DUNE_SPGRID diff --git a/examples/surface.cc b/examples/surface.cc index 2f8c8af2..2470fb08 100644 --- a/examples/surface.cc +++ b/examples/surface.cc @@ -1,4 +1,3 @@ -#include "config.h" #include #include #include diff --git a/examples/vecellipt.cc b/examples/vecellipt.cc index 7f183562..6f6b2048 100644 --- a/examples/vecellipt.cc +++ b/examples/vecellipt.cc @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include diff --git a/test/AdaptiveGridTest.cpp b/test/AdaptiveGridTest.cpp index 4436e81e..0bd0ccae 100644 --- a/test/AdaptiveGridTest.cpp +++ b/test/AdaptiveGridTest.cpp @@ -1,4 +1,5 @@ -#include "config.h" +#include + #include #include diff --git a/test/DOFVectorTest.cpp b/test/DOFVectorTest.cpp index 5ecfc92b..c786f130 100644 --- a/test/DOFVectorTest.cpp +++ b/test/DOFVectorTest.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #include diff --git a/test/DataTransferTest.hpp b/test/DataTransferTest.hpp index cf97beac..f209984c 100644 --- a/test/DataTransferTest.hpp +++ b/test/DataTransferTest.hpp @@ -1,7 +1,4 @@ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include #include #include diff --git a/test/ISTLCommTest.cpp b/test/ISTLCommTest.cpp index a8b57912..335c1c14 100644 --- a/test/ISTLCommTest.cpp +++ b/test/ISTLCommTest.cpp @@ -1,4 +1,4 @@ -#include "config.h" +#include #include #include diff --git a/test/OperatorsTest.cpp b/test/OperatorsTest.cpp index da142e9a..495359dc 100644 --- a/test/OperatorsTest.cpp +++ b/test/OperatorsTest.cpp @@ -1,6 +1,3 @@ -// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -// vi: set et ts=4 sw=2 sts=2: -#include "config.h" #include #include #include diff --git a/test/TreeContainerTest.cpp b/test/TreeContainerTest.cpp index 3c4be151..f3b5d839 100644 --- a/test/TreeContainerTest.cpp +++ b/test/TreeContainerTest.cpp @@ -1,4 +1,5 @@ -#include "config.h" +#include + #include #include -- GitLab