Merge from mainline.

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

diff --cc deal.II/examples/step-42/step-42.cc
index 2613a848b2d482a580a79fd4e9a48648d792527c,2613a848b2d482a580a79fd4e9a48648d792527c..a9139efc1a511a5cee7eda63a2dc89997d027020
--- 1/deal.II/examples/step-42/step-42.cc
--- 2/deal.II/examples/step-42/step-42.cc
+++ b/deal.II/examples/step-42/step-42.cc
@@@ -943,7 -943,7 +943,7 @@@ namespace Step4
      FullMatrix<double> cell_matrix(dofs_per_cell, dofs_per_cell);
      Vector<double> cell_rhs(dofs_per_cell);
  
--    std::vector<unsigned int> local_dof_indices(dofs_per_cell);
++    std::vector<types::global_dof_indices> local_dof_indices(dofs_per_cell);
  
      typename DoFHandler<dim>::active_cell_iterator cell =
        dof_handler.begin_active(), endc = dof_handler.end();
@@@ -1069,7 -1069,7 +1069,7 @@@
  
      Vector<double> cell_rhs(dofs_per_cell);
  
--    std::vector<unsigned int> local_dof_indices(dofs_per_cell);
++    std::vector<types::global_dof_indices> local_dof_indices(dofs_per_cell);
  
      const FEValuesExtractors::Vector displacement(0);
  
@@@ -1198,7 -1198,7 +1198,7 @@@
      for (unsigned i = 0; i < dim; i++)
        ones[i] = 1.0;
  
--    std::vector<unsigned int> local_dof_indices(dofs_per_cell);
++    std::vector<types::global_dof_indices> local_dof_indices(dofs_per_cell);
  
      const FEValuesExtractors::Vector displacement(0);
  

diff --cc deal.II/examples/step-50/step-50.cc
index 8d30f71d4aa12d1014649cdc5eb5f2e0f9c9385a,8d30f71d4aa12d1014649cdc5eb5f2e0f9c9385a..797d5bac7353fcd34606e5498e7d35154a1ae60d
--- 1/deal.II/examples/step-50/step-50.cc
--- 2/deal.II/examples/step-50/step-50.cc
+++ b/deal.II/examples/step-50/step-50.cc
@@@ -486,7 -486,7 +486,7 @@@ namespace Step5
      FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
      Vector<double>       cell_rhs (dofs_per_cell);
  
--    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
++    std::vector<types::global_dof_indices> local_dof_indices (dofs_per_cell);
  
      const Coefficient<dim> coefficient;
      std::vector<double>    coefficient_values (n_q_points);
@@@ -561,7 -561,7 +561,7 @@@
  
      FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
  
--    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
++    std::vector<types::global_dof_indices> local_dof_indices (dofs_per_cell);
  
      const Coefficient<dim> coefficient;
      std::vector<double>    coefficient_values (n_q_points);

diff --cc tests/base/graph_coloring_01.cc
Simple merge

diff --cc tests/base/graph_coloring_02.cc
Simple merge

diff --cc tests/base/graph_coloring_03.cc
Simple merge