remove friend declarations of OneDGridSubEntityFactory

[[Imported from SVN: r3964]]

grid/onedgrid/onedgridentity.hh

@@ -240,10 +240,6 @@ namespace Dune {
     friend class OneDGridHierarchicIterator <GridImp>;
     friend class OneDGridLevelIterator <0,All_Partition,GridImp>;
 
-    template <int cc_, int dim_, class GridImp_>
-    friend class OneDGridSubEntityFactory;
-
-
   public:
     typedef typename GridImp::template Codim<0>::Geometry Geometry;
     typedef typename GridImp::template Codim<0>::LevelIterator LevelIterator;

grid/onedgrid/onedgridgeometry.hh

@@ -78,14 +78,10 @@ namespace Dune {
     template <int mydim_, int coorddim_, class GridImp_>
     friend class OneDGridGeometry;
 
-    template <int cc_, int dim_, class GridImp_>
-    friend class OneDGridSubEntityFactory;
-
-
   public:
 
     //! return the element type identifier (vertex)
-    NewGeometryType type () const {return NewGeometryType(NewGeometryType::cube,0);}
+    NewGeometryType type () const {return NewGeometryType(0);}
 
     //! return the number of corners of this element (==1)
     int corners () const {return 1;}
@@ -127,7 +123,7 @@ namespace Dune {
      *
      * OneDGrid obviously supports only lines
      */
-    NewGeometryType type () const {return NewGeometryType(NewGeometryType::cube,1);}
+    NewGeometryType type () const {return NewGeometryType(1);}
 
     //! return the number of corners of this element. Corners are numbered 0...n-1
     int corners () const {return 2;}