removed deprecated methods mark(Entity&) and global_size()

[[Imported from SVN: r2010]]

grid/uggrid.hh

@@ -230,13 +230,6 @@ namespace Dune {
       return 0;
     }
 
-
-#ifdef UGGRID_WITH_INDEX_SETS
-    int global_size (int codim) const DUNE_DEPRECATED { return hierarchicIndexSet().size(maxlevel(),codim); }
-#else
-    int global_size (int codim) const DUNE_DEPRECATED { return size(maxlevel(),codim); }
-#endif
-
     /** \brief Mark entity for refinement
      *
      * This only works for entities of codim 0.
@@ -247,12 +240,7 @@ namespace Dune {
      * <li> false, if nothing changed </li>
      * </ul>
      */
-    bool mark(int refCount, typename Traits::template codim<0>::EntityPointer & e ) {
-      return mark(refCount, *e);
-    }
-
-    /** \brief Tempory for Robert */
-    bool mark(int refCount, typename Traits::template codim<0>::Entity& e );
+    bool mark(int refCount, typename Traits::template codim<0>::EntityPointer & e );
 
     /** \brief Mark method accepting a UG refinement rule
      */

grid/uggrid/uggrid.cc

@@ -401,17 +401,14 @@ void Dune::UGGrid < dim, dimworld >::makeNewUGMultigrid()
 }
 
 template < int dim, int dimworld >
-// bool Dune::UGGrid < dim, dimworld >::mark(int refCount,
-//                                          typename Traits::template codim<0>::EntityPointer & e )
 bool Dune::UGGrid < dim, dimworld >::mark(int refCount,
-                                          typename Traits::template codim<0>::Entity& e )
+                                          typename Traits::template codim<0>::EntityPointer & e )
 {
   // No refinement requested
   if (refCount==0)
     return false;
 
-  //typename TargetType<0,dim>::T* target = getRealEntity<0>(*e).target_;
-  typename TargetType<0,dim>::T* target = getRealEntity<0>(e).target_;
+  typename TargetType<0,dim>::T* target = getRealEntity<0>(*e).target_;
 
   // Check whether element can be marked for refinement
   if (!EstimateHere(target))