From 45fe83b4c093b45e944a36a31765bf9161b6b43f Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 7 Jul 2011 11:44:44 +0000
Subject: [PATCH] Revert "- ups: the makro that checks the Dune version again"
This reverts commit 7047016851ec3d0c8d6a571ca42ec1335ec3a416.
the macros work, provided that they are used correctly
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6138 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/start.hh | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 8a08dfb855..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
+#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
#include <dune/common/parametertreeparser.hh>
-#endif // HAVE_DUNE21
+#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
+#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 //HAVE_DUNE21
+#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
}
--
GitLab