Merge branch 'Changed-referencehelper-for-CoarsenedGF' into 'master'

use-referencehelper-from-dune-common-for-Coarsened-Gridfunction

See merge request amdis/amdis!83

amdis/gridfunctions/CoarsenedGridFunction.hpp

@@ -3,7 +3,7 @@
 #include <functional>
 #include <type_traits>
 
-#include <dune/functions/common/referencehelper.hh>
+#include <dune/common/referencehelper.hh>
 #include <dune/functions/gridfunctions/gridviewentityset.hh>
 
 #include <amdis/common/TypeTraits.hpp>
@@ -193,18 +193,18 @@ public:
   template <class GF_ = GF>
   auto makeDerivative() const
     -> CoarsenedGridFunction<GV,
-        TYPEOF(derivative(Dune::Functions::resolveRef(std::declval<GF_ const&>())))>
+        TYPEOF(derivative(Dune::resolveRef(std::declval<GF_ const&>())))>
   {
-    return {gridView_, derivative(Dune::Functions::resolveRef(gridFct_))};
+    return {gridView_, derivative(Dune::resolveRef(gridFct_))};
   }
 
   /// \brief Construct local function from a DiscreteGlobalBasisFunction
   auto makeLocalFunction() const
   {
-    using LF = TYPEOF(localFunction(Dune::Functions::resolveRef(gridFct_)));
+    using LF = TYPEOF(localFunction(Dune::resolveRef(gridFct_)));
     using LocalFunction = CoarsenedLocalFunction<EntitySet,LF>;
     return LocalFunction{gridFct_.entitySet(),
-                         localFunction(Dune::Functions::resolveRef(gridFct_)),
+                         localFunction(Dune::resolveRef(gridFct_)),
                          gridView_.grid().maxLevel()};
   }