From 4c2476403afc4c89895136e9371f86246fb895fb Mon Sep 17 00:00:00 2001
From: Philipp Nuske <philipp.nuske@mailbox.org>
Date: Tue, 28 Jun 2011 17:50:13 +0000
Subject: [PATCH] - ups: the makro that checks the Dune version again
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6099 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/start.hh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 984fe60ab0..8a08dfb855 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -32,9 +32,13 @@
#include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
+#define HAVE_DUNE21 \
+ (DUNE_COMMON_VERSION_MAJOR > 2 \
+ || (DUNE_COMMON_VERSION_MAJOR == 2 && DUNE_COMMON_VERSION_MINOR >= 1))
+
+#if HAVE_DUNE21
#include <dune/common/parametertreeparser.hh>
-#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
+#endif // HAVE_DUNE21
namespace Dumux
@@ -234,7 +238,7 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
return 3;
};
-#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
+#if HAVE_DUNE21
// requires DUNE 2.1 and above
/*!
@@ -331,7 +335,7 @@ int startFromInputFile(int argc, char **argv)
return 3;
}
-#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
+#endif //HAVE_DUNE21
}
--
GitLab