From: heister Date: Wed, 19 Sep 2012 18:13:39 +0000 (+0000) Subject: merge from mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6c3ac1d67e46538256fdfaf3186beb28035e59a;p=dealii-svn.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@26520 0785d39b-7218-0410-832d-ea1e28bc413d --- c6c3ac1d67e46538256fdfaf3186beb28035e59a diff --cc deal.II/source/dofs/dof_tools.cc index 24638fcec6,d49f42032f..a72d614b2e --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@@ -5690,20 -5690,20 +5690,20 @@@ namespace DoFTool // otherwise enter all constraints - constraints.add_line (global_dof); - - constraint_line.clear (); - for (unsigned int row=first_used_row; row::const_iterator - j = weights[row].find(col); - if ((j != weights[row].end()) && (j->second != 0)) - constraint_line.push_back (std::pair(representants[row], - j->second)); - }; - - constraints.add_entries (global_dof, constraint_line); - }; + constraints.add_line (global_dof); + + constraint_line.clear (); + for (unsigned int row=first_used_row; row::const_iterator + j = weights[row].find(col); + if ((j != weights[row].end()) && (j->second != 0)) - constraint_line.push_back (std::make_pair(representants[row], ++ constraint_line.push_back (std::pair(representants[row], + j->second)); + }; + + constraints.add_entries (global_dof, constraint_line); + }; }