From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 30 Sep 2013 13:43:43 +0000 (+0000)
Subject: Merge again from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4ecf7b27219d16f89b0aa35c7557e8ed078d9f;p=dealii-svn.git

Merge again from mainline.

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

9c4ecf7b27219d16f89b0aa35c7557e8ed078d9f
diff --cc tests/base/graph_coloring_01.cc
index ca85c82d9e,9a0a79d745..ed4be3f137
--- a/tests/base/graph_coloring_01.cc
+++ b/tests/base/graph_coloring_01.cc
@@@ -59,7 -59,7 +59,7 @@@ void check(
    std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(cell,dof_handler.end(),
        std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--        DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));      
++        DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));      
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)
diff --cc tests/base/graph_coloring_02.cc
index 6fdd5216e6,56aae036ea..456732eb36
--- a/tests/base/graph_coloring_02.cc
+++ b/tests/base/graph_coloring_02.cc
@@@ -69,7 -69,7 +69,7 @@@ void check(
    std::vector<std::vector<typename DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
          std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--          DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));
++          DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)
diff --cc tests/base/graph_coloring_03.cc
index 0a72963b40,812bb7fdf9..3db85f0e9f
--- a/tests/base/graph_coloring_03.cc
+++ b/tests/base/graph_coloring_03.cc
@@@ -71,7 -71,7 +71,7 @@@ void check(
    std::vector<std::vector<typename hp::DoFHandler<dim>::active_cell_iterator> > coloring(
        graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(),
          std_cxx1x::function<std::vector<types::global_dof_index> (typename 
--          hp::DoFHandler<dim>::active_cell_iterator const &)> (get_conflict_indices_cfem<dim>)));
++          hp::DoFHandler<dim>::active_cell_iterator const &)> (&get_conflict_indices_cfem<dim>)));
  
    // Output the coloring
    for (unsigned int color=0; color<coloring.size(); ++color)
diff --cc tests/lac/sparse_matrices.cc
index 07fc908ca6,60479f158c..e194b05555
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@@ -279,6 -279,6 +279,7 @@@ int main(
    logfile << std::setprecision(3);
    deallog << std::setprecision(3);
    deallog.attach(logfile);
++  deallog.depth_console (0);
  
    // Switch between regression test
    // and benchmark