Merge pull request #2215 from dr-robertk/PR/fix-compile-dune27

Fix compilation with DUNE 2.7

ebos/femcpgridcompat.hh

@@ -46,13 +46,6 @@ template <int codim>
 class EntityPointer;
 }
 
-#if DUNE_VERSION_NEWER(DUNE_FEM, 2, 6)
-template <int dim, int cdim>
-auto referenceElement(const Dune::cpgrid::Geometry<dim, cdim>& geo)
-    -> decltype(referenceElement<double, dim>(geo.type()))
-{ return referenceElement<double, dim>(geo.type()); }
-#endif
-
 // specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
 namespace Fem {
 
@@ -61,6 +54,7 @@ namespace Fem {
 //  make_entity for CpGrid entities
 //
 ////////////////////////////////////////////////////////////
+#if ! DUNE_VERSION_NEWER(DUNE_GRID, 2, 6)
 template <int codim>
 inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
 { return *entityPointer; }
@@ -68,6 +62,7 @@ inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer
 template <int codim>
 inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
 { return std::move(entity); }
+#endif
 
 ////////////////////////////////////////////////////////////
 //