From 39e0a2b7c472f83960cd357723ae752e706cf27f Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robertk@posteo.org>
Date: Wed, 6 Aug 2014 14:00:54 +0200
Subject: [PATCH] Make code compile with dune trunk version (ie 3.0-git). This
 should include support for dune 2.3.

---
 CMakeLists.txt                       | 2 +-
 tests/test_parallel_linearsolver.cpp | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48a52549..b33356d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ include (${project}-prereqs)
 include (CMakeLists_files.cmake)
 
 macro (config_hook)
-#	opm_need_version_of ("dune-common")
+	opm_need_version_of ("dune-common")
   opm_need_version_of ("dune-istl")
 endmacro (config_hook)
 
diff --git a/tests/test_parallel_linearsolver.cpp b/tests/test_parallel_linearsolver.cpp
index 8fc3833d..3ca362a4 100644
--- a/tests/test_parallel_linearsolver.cpp
+++ b/tests/test_parallel_linearsolver.cpp
@@ -30,11 +30,19 @@
 // MPI header
 #if HAVE_MPI
 #include <mpi.h>
+#include <dune/common/version.hh>
 #include <dune/common/parallel/indexset.hh>
 #include <dune/common/parallel/communicator.hh>
 #include <dune/common/parallel/remoteindices.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpicollectivecommunication.hh>
+#include <dune/common/parallel/collectivecommunication.hh>
+#else
 #include <dune/common/mpicollectivecommunication.hh>
 #include <dune/common/collectivecommunication.hh>
+#endif
+
 #include <dune/istl/owneroverlapcopy.hh>
 #include <opm/core/linalg/ParallelIstlInformation.hpp>
 #else