From a64b082894e42aec748e963c46a81969f52912ac Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Mon, 17 Sep 2012 13:56:47 +0200 Subject: [PATCH] Do not use decltype --- src/one-body-sample.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 7a901307..dafab2dd 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -297,25 +297,28 @@ int main(int argc, char *argv[]) { first_frictional_node < frictionalNodes.size()) ++first_frictional_node; - Dune::shared_ptr<TimeSteppingScheme<VectorType, MatrixType, - decltype(dirichletFunction), dim>> + Dune::shared_ptr<TimeSteppingScheme< + VectorType, MatrixType, Dune::VirtualFunction<double, double>, dim>> timeSteppingScheme; switch (parset.get<Config::scheme>("timeSteppingScheme")) { case Config::ImplicitTwoStep: - timeSteppingScheme = Dune::make_shared<ImplicitTwoStep< - VectorType, MatrixType, decltype(dirichletFunction), dim>>( + timeSteppingScheme = Dune::make_shared< + ImplicitTwoStep<VectorType, MatrixType, + Dune::VirtualFunction<double, double>, dim>>( stiffnessMatrix, u_initial, ud_initial, ignoreNodes, dirichletFunction); break; case Config::ImplicitEuler: - timeSteppingScheme = Dune::make_shared<ImplicitEuler< - VectorType, MatrixType, decltype(dirichletFunction), dim>>( + timeSteppingScheme = Dune::make_shared< + ImplicitEuler<VectorType, MatrixType, + Dune::VirtualFunction<double, double>, dim>>( stiffnessMatrix, u_initial, ud_initial, ignoreNodes, dirichletFunction); break; case Config::Newmark: timeSteppingScheme = Dune::make_shared< - Newmark<VectorType, MatrixType, decltype(dirichletFunction), dim>>( + Newmark<VectorType, MatrixType, + Dune::VirtualFunction<double, double>, dim>>( stiffnessMatrix, massMatrix, u_initial, ud_initial, udd_initial, ignoreNodes, dirichletFunction); break; -- GitLab