From: Bruno Turcksin Date: Tue, 19 Mar 2013 19:32:47 +0000 (+0000) Subject: Merge from mainline. X-Git-Tag: v8.0.0~316^2~125 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6d95f19a50e9878cbe7a0c7771da928f0cef90;p=dealii.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28945 0785d39b-7218-0410-832d-ea1e28bc413d --- 4c6d95f19a50e9878cbe7a0c7771da928f0cef90 diff --cc deal.II/include/deal.II/meshworker/dof_info.h index 08ea1d316b,cc12fedd04..76f1679ce9 --- a/deal.II/include/deal.II/meshworker/dof_info.h +++ b/deal.II/include/deal.II/meshworker/dof_info.h @@@ -281,10 -280,9 +280,9 @@@ namespace MeshWorke //----------------------------------------------------------------------// template - template - DoFInfo::DoFInfo(const DH &dof_handler) + DoFInfo::DoFInfo(const DoFHandler &dof_handler) { - std::vector aux(1); + std::vector aux(1); aux[0] = dof_handler.get_fe().dofs_per_cell; aux_local_indices.reinit(aux); }