From: heister Date: Mon, 3 Sep 2012 22:39:48 +0000 (+0000) Subject: merge from mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=633c769b4896df24df10a85ba049fd3838705569;p=dealii-svn.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@26223 0785d39b-7218-0410-832d-ea1e28bc413d --- 633c769b4896df24df10a85ba049fd3838705569 diff --cc deal.II/include/deal.II/dofs/dof_handler.h index 9c309c6539,68fdcc45d8..f0ec67fc86 --- a/deal.II/include/deal.II/dofs/dof_handler.h +++ b/deal.II/include/deal.II/dofs/dof_handler.h @@@ -317,10 -305,7 +305,9 @@@ class DoFHandler : public Subscripto * releases the lock of this * object to the finite element. */ - virtual void distribute_dofs (const FiniteElement &fe, - const unsigned int offset = 0); + virtual void distribute_dofs (const FiniteElement &fe); + - virtual void distribute_mg_dofs (const FiniteElement& fe, const unsigned int offset = 0); ++ virtual void distribute_mg_dofs (const FiniteElement& fe); /** * After distribute_dofs() with