From 3cbc77f72391459f0d88ae4cf042e5ba87820426 Mon Sep 17 00:00:00 2001 From: Christian Engwer <christi@dune-project.org> Date: Tue, 9 Sep 2008 09:46:06 +0000 Subject: [PATCH] fix includes of several headers [[Imported from SVN: r941]] --- istl/communicator.hh | 7 +++++++ istl/plocalindex.hh | 1 + istl/selection.hh | 6 +++--- istl/test/laplacian.hh | 1 + istl/vbcrsmatrix.hh | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/istl/communicator.hh b/istl/communicator.hh index 9776c98ba..f6d18a158 100644 --- a/istl/communicator.hh +++ b/istl/communicator.hh @@ -8,6 +8,11 @@ #include "interface.hh" #include <dune/common/exceptions.hh> #include <dune/common/typetraits.hh> + +#if HAVE_MPI +// MPI header +#include <mpi.h> + namespace Dune { /** @defgroup ISTL_Comm ISTL Communication @@ -1500,3 +1505,5 @@ namespace Dune } #endif + +#endif diff --git a/istl/plocalindex.hh b/istl/plocalindex.hh index dd2afb380..7551998f9 100644 --- a/istl/plocalindex.hh +++ b/istl/plocalindex.hh @@ -7,6 +7,7 @@ #include "localindex.hh" #include "mpitraits.hh" +#include <iostream> namespace Dune { diff --git a/istl/selection.hh b/istl/selection.hh index 9eb2a942c..bf42c3d61 100644 --- a/istl/selection.hh +++ b/istl/selection.hh @@ -40,7 +40,7 @@ namespace Dune /** * @brief The type of the underlying index set. */ - typedef ParallelIndexSet<TG,TL,N> ParallelIndexSet; + typedef Dune::ParallelIndexSet<TG,TL,N> ParallelIndexSet; //typedef typename ParallelIndexSet::const_iterator ParallelIndexSetIterator; @@ -121,7 +121,7 @@ namespace Dune /** * @brief The type of the underlying index set. */ - typedef ParallelIndexSet<GlobalIndex,LocalIndex,N> ParallelIndexSet; + typedef Dune::ParallelIndexSet<GlobalIndex,LocalIndex,N> ParallelIndexSet; /** * @brief The type of the iterator of the selected indices. @@ -204,7 +204,7 @@ namespace Dune /** * @brief The type of the underlying index set. */ - typedef ParallelIndexSet<GlobalIndex,LocalIndex,N> ParallelIndexSet; + typedef Dune::ParallelIndexSet<GlobalIndex,LocalIndex,N> ParallelIndexSet; /** * @brief The type of the iterator of the selected indices. diff --git a/istl/test/laplacian.hh b/istl/test/laplacian.hh index 053b33683..141f19fd6 100644 --- a/istl/test/laplacian.hh +++ b/istl/test/laplacian.hh @@ -3,6 +3,7 @@ #ifndef LAPLACIAN_HH #define LAPLACIAN_HH #include <dune/istl/bcrsmatrix.hh> +#include <dune/common/fvector.hh> template<class B> void setupSparsityPattern(Dune::BCRSMatrix<B>& A, int N) diff --git a/istl/vbcrsmatrix.hh b/istl/vbcrsmatrix.hh index 2df94ee61..632a1891b 100644 --- a/istl/vbcrsmatrix.hh +++ b/istl/vbcrsmatrix.hh @@ -6,7 +6,7 @@ #include <cmath> #include <complex> -#include "istlexection.hh" +#include "istlexception.hh" #include "allocator.hh" /*! \file -- GitLab