From 20b420810d09c735b7307967c60eeb840beec063 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Tue, 28 Jun 2011 15:09:19 +0000
Subject: [PATCH] use DUNE_NEWER_REV macros correctly
hopefully...
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6094 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/start.hh | 12 ++++--------
dumux/io/vtkmultiwriter.hh | 2 +-
dumux/io/vtknestedfunction.hh | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 27d06f066c..984fe60ab0 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -32,13 +32,9 @@
#include <dune/common/version.hh>
-#define HAVE_DUNE21 \
- (DUNE_COMMON_VERSION_MAJOR > 2 \
- || (DUNE_COMMON_VERSION_MAJOR == 2 && DUNE_COMMON_VERSION_MINOR >= 1))
-
-#if HAVE_DUNE21 //DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
+#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
#include <dune/common/parametertreeparser.hh>
-#endif // DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
+#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
namespace Dumux
@@ -238,7 +234,7 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
return 3;
};
-#if HAVE_DUNE21 //DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
+#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
// requires DUNE 2.1 and above
/*!
@@ -335,7 +331,7 @@ int startFromInputFile(int argc, char **argv)
return 3;
}
-#endif // DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
+#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
}
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index ac3b9c9b9b..37097a0f59 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -59,7 +59,7 @@ class VtkMultiWriter
typedef typename GridView::Grid Grid;
enum { dim = GridView::dimension };
-#if DUNE_VERSION_NEWER_REV(GRID, 2, 1, 0)
+#if DUNE_VERSION_NEWER_REV(DUNE_GRID, 2, 1, 0)
// DUNE 2.1 and above
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
diff --git a/dumux/io/vtknestedfunction.hh b/dumux/io/vtknestedfunction.hh
index 98c50d1db7..d3b6691a7a 100644
--- a/dumux/io/vtknestedfunction.hh
+++ b/dumux/io/vtknestedfunction.hh
@@ -29,7 +29,7 @@
#include <dune/istl/bvector.hh>
#include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER_REV(GRID, 2, 1, 0)
+#if DUNE_VERSION_NEWER_REV(DUNE_GRID, 2, 1, 0)
// DUNE 2.1 and above
#include <dune/grid/io/file/vtk/function.hh>
#else
--
GitLab