relaxed dune-functions version requirement to 2.5

dune.module

@@ -7,5 +7,5 @@ Module: dune-vtk
 Version: 0.1
 Maintainer: simon.praetorius@tu-dresden.de
 #depending on
-Depends: dune-grid (>= 2.6)
-Suggests: dune-functions (>= 2.6) dune-spgrid dune-polygongrid
\ No newline at end of file
+Depends: dune-common (>= 2.6) dune-geometry (>= 2.6) dune-grid
+Suggests: dune-functions dune-spgrid dune-polygongrid

src/datacollector.cc

@@ -11,6 +11,7 @@
 #include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
 #include <dune/common/exceptions.hh> // We use exceptions
 #include <dune/common/filledarray.hh>
+#include <dune/common/version.hh>
 
 #include <dune/functions/functionspacebases/defaultglobalbasis.hh>
 #include <dune/functions/functionspacebases/lagrangebasis.hh>
@@ -44,7 +45,11 @@ void write_dc (std::string prefix, GridView const& gridView, Fct1 const& fct1, F
 template <class GridView>
 void write (std::string prefix, GridView const& gridView)
 {
+#if ! DUNE_VERSION_NEWER(DUNE_FUNCTIONS, 2, 6)
+  using namespace BasisBuilder;
+#else
   using namespace BasisFactory;
+#endif
   auto basis = makeBasis(gridView, lagrange<1>());
 
   FieldVector<double,GridView::dimensionworld> c;

src/vtkwriter.cc

@@ -10,6 +10,7 @@
 
 #include <dune/common/parallel/mpihelper.hh> // An initializer of MPI
 #include <dune/common/exceptions.hh> // We use exceptions
+#include <dune/common/version.hh>
 
 #include <dune/functions/functionspacebases/defaultglobalbasis.hh>
 #include <dune/functions/functionspacebases/lagrangebasis.hh>
@@ -37,7 +38,11 @@ static TestCases test_cases = {
 template <class GridView>
 void write (std::string prefix, GridView const& gridView)
 {
+#if ! DUNE_VERSION_NEWER(DUNE_FUNCTIONS, 2, 6)
+  using namespace BasisBuilder;
+#else
   using namespace BasisFactory;
+#endif
   auto basis = makeBasis(gridView, lagrange<1>());
 
   FieldVector<double,GridView::dimensionworld> c;
@@ -97,4 +102,4 @@ int main (int argc, char** argv)
     GridType grid(upperRight, numElements, 0, 0);
     write("vtkwriter_yasp", grid.leafGridView());
   });
-}
\ No newline at end of file
+}