From 39065fee4b6283ea87fc69dd923b1b5eebb43b1a Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Wed, 22 May 2013 12:43:35 +0000
Subject: [PATCH] Get rid of DUNE_VERSION_NEWER_REV which should be avoided.
(reviewed by karens)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10732 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/box/boxfvelementgeometry.hh | 2 +-
dumux/implicit/cellcentered/ccfvelementgeometry.hh | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/dumux/implicit/box/boxfvelementgeometry.hh b/dumux/implicit/box/boxfvelementgeometry.hh
index b75b467e46..b3fad77f5b 100644
--- a/dumux/implicit/box/boxfvelementgeometry.hh
+++ b/dumux/implicit/box/boxfvelementgeometry.hh
@@ -327,7 +327,7 @@ class BoxFVElementGeometry
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef typename GridView::IntersectionIterator IntersectionIterator;
-#if DUNE_VERSION_NEWER_REV(DUNE_GRID, 2, 3, 0)
+#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Geometry::JacobianInverseTransposed JacobianInverseTransposed;
#else
typedef typename Geometry::Jacobian JacobianInverseTransposed;
diff --git a/dumux/implicit/cellcentered/ccfvelementgeometry.hh b/dumux/implicit/cellcentered/ccfvelementgeometry.hh
index 3a1e3c3697..eb600d119c 100644
--- a/dumux/implicit/cellcentered/ccfvelementgeometry.hh
+++ b/dumux/implicit/cellcentered/ccfvelementgeometry.hh
@@ -28,16 +28,8 @@
#define DUMUX_CC_FV_ELEMENTGEOMETRY_HH
#include <dune/common/version.hh>
-#include <dune/grid/common/intersectioniterator.hh>
-
-#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 2, 0)
-// dune 2.2
-#include <dune/geometry/referenceelements.hh>
-#else
-// dune 2.1
#include <dune/geometry/referenceelements.hh>
-#endif
-
+#include <dune/grid/common/intersectioniterator.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include <dumux/common/propertysystem.hh>
--
GitLab