Merge branch 'feature/remove-deprecated-2.9' into 'master'

DUNE_VERSION_NEWER macro is deprecated and will be removed

See merge request !59

dune/fem-dg/operator/adaptation/estimator.hh

@@ -136,12 +136,7 @@ namespace Fem
       {
         if( intersection.neighbor() )
         {
-#if DUNE_VERSION_NEWER(DUNE_GRID,2,4)
           const GridElementType &neighbor = intersection.outside();
-#else
-          typename GridElementType::EntityPointer outside = intersection.outside();
-          const GridElementType& neighbor = Dune :: Fem :: gridEntity( *outside );
-#endif
           // only do the following when the neighbor is not a ghost entity
           if( neighbor.partitionType() != Dune::GhostEntity )
           {

dune/fem-dg/operator/adaptation/stokesestimator.hh

@@ -57,9 +57,6 @@ namespace Fem
     typedef typename GridPartType::IntersectionType                  IntersectionType;
 
     typedef typename GridType::template Codim< 0 >::Entity           ElementType;
-#if not DUNE_VERSION_NEWER(DUNE_GRID,2,4)
-    typedef typename GridType::template Codim< 0 >::EntityPointer    ElementPointerType;
-#endif
     typedef typename ElementType::Geometry                           GeometryType;
 
     static const int dimension = GridType::dimension;

dune/optim/common/axisalignedreferencefaces.hh

@@ -5,11 +5,7 @@
 
 #include <memory>
 
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 5)
 #include <dune/geometry/type.hh>
-#else
-#include <dune/geometry/genericgeometry/topologytypes.hh>
-#endif
 
 namespace Dune
 {
@@ -47,11 +43,7 @@ namespace Dune
 
   void axisAlignedReferenceFaces ( int dim, unsigned int *faceIndices )
   {
-#if DUNE_VERSION_NEWER( DUNE_GEOMETRY, 2, 5 )
     const unsigned int numTopo = Impl::numTopologies( dim );
-#else
-    const unsigned int numTopo = GenericGeometry::numTopologies( dim );
-#endif
     std::unique_ptr< unsigned int[] > numFaces( new unsigned int[ numTopo ] );
     axisAlignedReferenceFaces( dim, faceIndices, numFaces.get() );
   }