From 4c7dee8d69c08be90184b3d73c1915325b565d61 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 16 Dec 2011 17:22:34 +0100
Subject: [PATCH] Use make_shared
---
dune/tectonic/globalruinanonlinearity.hh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 2634563d..4c15db46 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -29,8 +29,8 @@ class GlobalRuinaNonlinearity
mu(mu),
eta(eta),
normalStress(normalStress),
- trivialNonlinearity(new LocalNonlinearity<dim>(
- shared_ptr<NiceFunction const>(new TrivialFunction))) {}
+ trivialNonlinearity(
+ new LocalNonlinearity<dim>(make_shared<TrivialFunction const>())) {}
/*
Return a restriction of the outer function to the i'th node.
@@ -40,10 +40,10 @@ class GlobalRuinaNonlinearity
return trivialNonlinearity;
// TODO: cache functions
- shared_ptr<NiceFunction const> const func(
- new RuinaFunction((*nodalIntegrals)[i][0], (*a)[i][0], (*mu)[i][0],
- (*eta)[i][0], (*normalStress)[i][0]));
- return shared_ptr<LocalNonlinearity<dim>>(new LocalNonlinearity<dim>(func));
+ auto const func = make_shared<RuinaFunction const>(
+ (*nodalIntegrals)[i][0], (*a)[i][0], (*mu)[i][0], (*eta)[i][0],
+ (*normalStress)[i][0]);
+ return make_shared<LocalNonlinearity<dim> const>(func);
}
private:
--
GitLab