Use a shared pointer

dune/tectonic/localnonlinearity.hh

@@ -18,7 +18,7 @@ template <int dimension> class LocalNonlinearity {
   typedef FieldVector<double, dimension> VectorType;
   typedef FieldMatrix<double, dimension, dimension> MatrixType;
 
-  LocalNonlinearity(NiceFunction const *func) : func_(func) {}
+  LocalNonlinearity(Dune::shared_ptr<NiceFunction> &func) : func_(func) {}
 
   double operator()(VectorType const x) const {
     double ret;
@@ -63,7 +63,7 @@ template <int dimension> class LocalNonlinearity {
   }
 
 private:
-  NiceFunction const *func_;
+  Dune::shared_ptr<NiceFunction> &func_;
 };
 }
 #endif

dune/tectonic/myblockproblem.hh

@@ -113,14 +113,13 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
       }
       assert(localA != NULL);
 
-      auto const f = problem.phi.restriction(m);
+      Dune::shared_ptr<Dune::NiceFunction> f(problem.phi.restriction(m));
       Dune::LocalNonlinearity<block_size> const phi(f);
       Dune::SampleFunctional<block_size> localJ(*localA, localb, phi,
                                                 ignore_component);
 
       LocalVectorType correction;
       Dune::minimise(localJ, ui, 5, bisection); // FIXME: hardcoded value
-      free(f);
     }
   }