Remove intermediate type ToUniquePtr in favor of std::unique_ptr

Requires core/dune-grid!497 (merged) to be merged before

dune/foamgrid/foamgrid/foamgridfactory.hh

@@ -42,11 +42,11 @@ template <int dimgrid, int dimworld, class ct>
     public:
 
 #if DUNE_VERSION_LT(DUNE_COMMON, 2, 7)
-        using GridPtrType = FoamGrid<dimgrid, dimworld, ctype>*;
+    using GridPtrType = FoamGrid<dimgrid, dimworld, ctype>*;
 #elif DUNE_VERSION_LT(DUNE_COMMON, 2, 8)
-        using GridPtrType = ToUniquePtr<FoamGrid<dimgrid, dimworld, ctype>>;
+    using GridPtrType = ToUniquePtr<FoamGrid<dimgrid, dimworld, ctype>>;
 #else
-        using GridPtrType = std::unique_ptr<FoamGrid<dimgrid, dimworld,ctype>>;
+    using GridPtrType = std::unique_ptr<FoamGrid<dimgrid, dimworld,ctype>>;
 #endif
 
     public:
@@ -152,6 +152,8 @@ template <int dimworld, class ct>
         template<int mydim>
         using EntityImp = FoamGridEntityImp<mydim, dimgrid, dimworld, ctype>;
 
+	using GridPtrType = typename GridFactoryBase<1, dimworld, ct>::GridPtrType;
+
     public:
 
         GridFactory() {}
@@ -326,6 +328,8 @@ template <int dimworld, class ct>
         template<int mydim>
         using EntityImp = FoamGridEntityImp<mydim, dimgrid, dimworld, ctype>;
 
+	using GridPtrType = typename GridFactoryBase<2, dimworld, ct>::GridPtrType;
+
     public:
 
         GridFactory() {}