From 4ac6d1649b2f27878b036c9ee6c139acf4f261f3 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 8 Feb 2016 13:16:27 +0100
Subject: [PATCH] Bugfix: guards for a 2.4-only header file were set around the
 wrong file

Of course we always need unitvector.hh.  vtkadapter.hh, on the other hand, only
exists in dune-functions 2.4.
---
 src/gradient-flow.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 585a4173..562ae3e5 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -19,7 +19,9 @@
 #include <dune/grid/io/file/gmshreader.hh>
 #include <dune/grid/io/file/vtk.hh>
 
+#if ! DUNE_VERSION_NEWER(DUNE_FUNCTIONS, 2, 5)
 #include <dune/functions/common/vtkadapter.hh>
+#endif
 #include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
 #include <dune/functions/functionspacebases/pqknodalbasis.hh>
 
@@ -33,9 +35,7 @@
 #include <dune/solvers/solvers/iterativesolver.hh>
 #include <dune/solvers/norms/energynorm.hh>
 
-#if DUNE_VERSION_NEWER(DUNE_FUNCTIONS, 2, 5)
 #include <dune/gfe/unitvector.hh>
-#endif
 #include <dune/gfe/localgeodesicfeadolcstiffness.hh>
 #include <dune/gfe/geodesicfeassembler.hh>
 #include <dune/gfe/riemanniantrsolver.hh>
-- 
GitLab