From c459f58c9fcd41f9fb74cc0b7f1479c07066e6ac Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 29 Nov 2012 12:01:09 +0000
Subject: [PATCH] [start.hh, timemanager.hh, dgfcreator.hh] Include MPIHelper
depending on Dune version because its header was moved. (reviewed by bernd)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9723 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/dgfgridcreator.hh | 11 ++++++++---
dumux/common/start.hh | 16 ++++++++++------
dumux/common/timemanager.hh | 8 ++++++--
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/dumux/common/dgfgridcreator.hh b/dumux/common/dgfgridcreator.hh
index 52a11c5932..75e87dd097 100644
--- a/dumux/common/dgfgridcreator.hh
+++ b/dumux/common/dgfgridcreator.hh
@@ -23,11 +23,16 @@
#ifndef DUMUX_DGF_GRID_CREATOR_HH
#define DUMUX_DGF_GRID_CREATOR_HH
-#include <dune/grid/io/file/dgfparser.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
#include <dune/common/mpihelper.hh>
+#endif
+#include <dune/grid/io/file/dgfparser.hh>
-#include <dumux/common/propertysystem.hh>
-#include <dumux/common/parameters.hh>
+#include "propertysystem.hh"
+#include "parameters.hh"
namespace Dumux
{
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index a52d8805e8..e17ff4615d 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -25,16 +25,20 @@
#include <iostream>
-#include "propertysystem.hh"
-#include "parameters.hh"
-#include "valgrind.hh"
-
-#include <dune/common/mpihelper.hh>
-#include <dune/common/version.hh>
#include <dune/common/parametertreeparser.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
+#include <dune/common/mpihelper.hh>
+#endif
#include <dune/grid/io/file/dgfparser.hh>
+#include "propertysystem.hh"
+#include "parameters.hh"
+#include "valgrind.hh"
+
namespace Dumux
{
// forward declaration of property tags
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index 5ba113b1d2..38ea60b1c2 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -23,11 +23,15 @@
#ifndef DUMUX_TIME_MANAGER_HH
#define DUMUX_TIME_MANAGER_HH
-#include <dumux/common/propertysystem.hh>
-
#include <dune/common/timer.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
#include <dune/common/mpihelper.hh>
+#endif
+#include "propertysystem.hh"
namespace Dumux
{
--
GitLab