Merge branch 'cherry-pick-88bfaa67' into 'releases/2.5'

Merge branch 'feature/fix-headercheck' into 'master'

Fix includes etc. to make headercheck pass

This should solve #35 .

See merge request !108

See merge request !111

dune/grid/common/entitypointer.hh

@@ -9,6 +9,7 @@
 #include <dune/common/iteratorfacades.hh>
 #include <dune/common/deprecated.hh>
 #include <dune/geometry/type.hh>
+#include <dune/grid/common/geometry.hh>
 #include <dune/grid/common/gridenums.hh>
 
 /** \file

dune/grid/identitygrid/identitygridintersections.hh

@@ -4,6 +4,7 @@
 #define DUNE_IDENTITYGRID_INTERSECTIONS_HH
 
 #include "identitygridleafiterator.hh"
+#include <dune/grid/identitygrid/identitygridentity.hh>
 
 /** \file
  * \brief The IdentityGridLeafIntersection and IdentityGridLevelIntersection classes

dune/grid/identitygrid/identitygridleafiterator.hh

@@ -3,6 +3,7 @@
 #ifndef DUNE_IDENTITYGRIDLEAFITERATOR_HH
 #define DUNE_IDENTITYGRIDLEAFITERATOR_HH
 
+#include <dune/grid/common/gridenums.hh>
 
 /** \file
  * \brief The IdentityGridLeafIterator class

dune/grid/test/checkcomcorrectness.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
+#ifndef DUNE_GRID_TEST_CHECKCOMMCORRECTNESS_HH
+#define DUNE_GRID_TEST_CHECKCOMMCORRECTNESS_HH
 
 #include <config.h>
 
@@ -12,6 +14,10 @@
 
 #include <dune/common/hash.hh>
 #include <dune/common/float_cmp.hh>
+#include <dune/geometry/dimension.hh>
+#include <dune/grid/common/capabilities.hh>
+#include <dune/grid/common/datahandleif.hh>
+#include <dune/grid/common/gridenums.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
 namespace Dune {
@@ -344,3 +350,5 @@ namespace Dune {
 
   } // namespace GridCheck
 } // namespace Dune
+
+#endif

dune/grid/test/yasp/test-yaspgrid.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
+#ifndef DUNE_GRID_TEST_TEST_YASPGRID_HH
+#define DUNE_GRID_TEST_TEST_YASPGRID_HH
+
+#include <dune/grid/yaspgrid.hh>
 
 #include <dune/grid/test/gridcheck.hh>
 #include <dune/grid/test/checkcommunicate.hh>
@@ -9,7 +13,9 @@
 #include <dune/grid/test/checkadaptation.hh>
 #include <dune/grid/test/checkpartition.hh>
 
-#include "dune/grid/test/checkcomcorrectness.hh"
+#include <dune/grid/test/checkcomcorrectness.hh>
+
+#include <dune/grid/yaspgrid/coordinates.hh>
 
 
 template<int dim, class CC>
@@ -197,3 +203,5 @@ void check_backuprestore(Dune::YaspGrid<dim,CC>* grid)
 
    delete grid;
 }
+
+#endif