From: turcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 8 Apr 2013 17:46:03 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c69e8c54df3651d7d9b2c351e1af2eb91181ea;p=dealii-svn.git

Merge from mainline.

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29219 0785d39b-7218-0410-832d-ea1e28bc413d
---

f0c69e8c54df3651d7d9b2c351e1af2eb91181ea
diff --cc deal.II/source/dofs/dof_handler_policy.cc
index 7155778e9a,87fe5c1f73..3dd3ddf823
--- a/deal.II/source/dofs/dof_handler_policy.cc
+++ b/deal.II/source/dofs/dof_handler_policy.cc
@@@ -605,8 -607,10 +607,10 @@@ namespace interna
                  }
  
  
-           for (std::vector<types::global_dof_index>::iterator i=dof_handler.mg_levels[level]->dof_object.dofs.begin();
-                i!=dof_handler.mg_levels[level]->dof_object.dofs.end(); ++i)
 -          for (std::vector<unsigned int>::iterator
++          for (std::vector<types::global_dof_index>::iterator
+ 		 i=dof_handler.mg_levels[level]->dof_object.dofs.begin();
+                i!=dof_handler.mg_levels[level]->dof_object.dofs.end();
+ 	       ++i)
              {
                if (*i != DoFHandler<1>::invalid_dof_index)
                  {