some more cleanups

[[Imported from SVN: r4451]]

grid/alu3dgrid/alu3dinclude.hh

@@ -207,6 +207,32 @@ namespace Dune {
     typedef ALU3DSPACE GitterType::Geometric::VertexGeo ImplementationType;
   };
 
+  //! contains list of vertices of one level
+  //! needed for VertexLevelIterator
+  class ALU3dGridVertexList
+  {
+  public:
+    // level vertex iterator list
+    typedef std::vector < ALU3DSPACE VertexType * > VertexListType;
+    typedef VertexListType :: iterator IteratorType;
+
+    ALU3dGridVertexList () : up2Date_(false) {}
+
+    size_t size () const { return vertexList_.size(); }
+
+    bool up2Date () const { return up2Date_;  }
+    void unsetUp2Date ()  { up2Date_ = false; }
+
+    // make grid walkthrough and calc global size
+    template <class GridType>
+    void setupVxList (const GridType & grid, int level);
+
+    IteratorType begin () { return vertexList_.begin(); }
+    IteratorType end   () { return vertexList_.end(); }
+  private:
+    bool up2Date_;
+    VertexListType vertexList_;
+  };
 
 #ifdef _ALU3DGRID_PARALLEL_
   static int __MyRank__ = -1;

grid/alu3dgrid/grid.hh

@@ -63,33 +63,6 @@ namespace Dune {
   template <class GridImp, int codim>
   struct ALU3dGridEntityFactory;
 
-  //! contains list of vertices of one level
-  //! needed for VertexLevelIterator
-  class ALU3dGridVertexList
-  {
-  public:
-    // level vertex iterator list
-    typedef std::vector < ALU3DSPACE VertexType * > VertexListType;
-    typedef VertexListType :: iterator IteratorType;
-
-    ALU3dGridVertexList () : up2Date_(false) {}
-
-    size_t size () const { return vertexList_.size(); }
-
-    bool up2Date () const { return up2Date_;  }
-    void unsetUp2Date ()  { up2Date_ = false; }
-
-    // make grid walkthrough and calc global size
-    template <class GridType>
-    void setupVxList (const GridType & grid, int level);
-
-    IteratorType begin () { return vertexList_.begin(); }
-    IteratorType end   () { return vertexList_.end(); }
-  private:
-    bool up2Date_;
-    VertexListType vertexList_;
-  };
-
   //**********************************************************************
   //
   // --ALU3dGrid

grid/alu3dgrid/iterator.hh

@@ -7,6 +7,7 @@
 
 // Dune includes
 #include "../common/grid.hh"
+#include <dune/grid/common/intersectioniteratorwrapper.hh>
 
 // Local includes
 #include "alu3dinclude.hh"
@@ -14,8 +15,6 @@
 #include "faceutility.hh"
 #include "myautoptr.hh"
 
-// using directives
-
 namespace ALUGridSpace {
   //*************************************************************
   //  definition of original LeafIterators of ALUGrid
@@ -726,7 +725,6 @@ namespace Dune {
     typedef typename GridImp::template Codim<0>::Entity Entity;
     typedef typename GridImp::template Codim<1>::Geometry Geometry;
     typedef typename GridImp::template Codim<1>::LocalGeometry LocalGeometry;
-    typedef ALU3dGridMakeableEntity<0,dim,GridImp> EntityImp;
 
     typedef ALU3dGridGeometry<dim-1,dimworld,GridImp> GeometryImp;
     typedef MakeableInterfaceObject<Geometry> GeometryObject;
@@ -912,8 +910,6 @@ namespace Dune {
     typedef typename GridImp::template Codim<cd>::Entity Entity;
     typedef ALU3DSPACE VertexListType VertexListType;
 
-    typedef ALU3dGridMakeableEntity<cd,dim,GridImp> EntityImp;
-
     //! typedef of my type
     typedef ALU3dGridLevelIterator<cd,pitype,GridImp> ALU3dGridLevelIteratorType;
 
@@ -970,7 +966,6 @@ namespace Dune {
 
   public:
     typedef typename GridImp::template Codim<cdim>::Entity Entity;
-    typedef ALU3dGridMakeableEntity<cdim,dim,GridImp> EntityImp;
 
     typedef ALU3dGridLeafIterator<cdim, pitype, GridImp> ALU3dGridLeafIteratorType;
 
@@ -1021,7 +1016,6 @@ namespace Dune {
   public:
     typedef typename GridImp::template Codim<0>::Entity Entity;
     typedef typename GridImp::ctype ctype;
-    typedef ALU3dGridMakeableEntity<0,dim,GridImp> EntityImp;
 
     //! the normal Constructor
     ALU3dGridHierarchicIterator(const GridImp &grid,