From: Wolfgang Bangerth Date: Sat, 13 Feb 2010 05:13:04 +0000 (+0000) Subject: Make previous commit useful so that we don't have to provide a template X-Git-Tag: v8.0.0~6471 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8232df840878de8c65efa9591dda8e7b9088ac;p=dealii.git Make previous commit useful so that we don't have to provide a template argument by hand. git-svn-id: https://svn.dealii.org/trunk@20590 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/multigrid/mg_smoother.h b/deal.II/deal.II/include/multigrid/mg_smoother.h index b352d3c2e5..d298470a95 100644 --- a/deal.II/deal.II/include/multigrid/mg_smoother.h +++ b/deal.II/deal.II/include/multigrid/mg_smoother.h @@ -236,9 +236,9 @@ class MGSmootherRelaxation : public MGSmoother * initialization function of the * relaxation method. */ - template + template void initialize (const MGLevelObject& matrices, - const DATA& additional_data = RELAX::AdditionalData()); + const typename RELAX::AdditionalData & additional_data = typename RELAX::AdditionalData()); /** * Initialize for matrices. This @@ -405,9 +405,9 @@ class MGSmootherPrecondition : public MGSmoother * initialization function of the * relaxation method. */ - template + template void initialize (const MGLevelObject& matrices, - const DATA& additional_data = PRECONDITIONER::AdditionalData()); + const typename PRECONDITIONER::AdditionalData& additional_data = typename PRECONDITIONER::AdditionalData()); /** * Initialize for matrices. This @@ -613,11 +613,11 @@ MGSmootherRelaxation::clear () template -template +template inline void MGSmootherRelaxation::initialize ( const MGLevelObject& m, - const DATA& data) + const typename RELAX::AdditionalData& data) { const unsigned int min = m.get_minlevel(); const unsigned int max = m.get_maxlevel(); @@ -829,6 +829,7 @@ MGSmootherPrecondition::MGSmootherPrecondition( {} + template inline void MGSmootherPrecondition::clear () @@ -842,12 +843,13 @@ MGSmootherPrecondition::clear () } + template -template +template inline void MGSmootherPrecondition::initialize ( const MGLevelObject& m, - const DATA& data) + const typename PRECONDITIONER::AdditionalData& data) { const unsigned int min = m.get_minlevel(); const unsigned int max = m.get_maxlevel(); @@ -862,6 +864,8 @@ MGSmootherPrecondition::initialize ( } } + + template template inline void @@ -887,6 +891,8 @@ MGSmootherPrecondition::initialize ( } } + + template template inline void @@ -909,6 +915,8 @@ MGSmootherPrecondition::initialize ( } } + + template template inline void @@ -936,6 +944,8 @@ MGSmootherPrecondition::initialize ( } } + + template inline void MGSmootherPrecondition::smooth( @@ -1009,6 +1019,7 @@ MGSmootherPrecondition::smooth( } + template inline unsigned int MGSmootherPrecondition::