From: Wolfgang Bangerth Date: Mon, 30 Sep 2013 13:43:43 +0000 (+0000) Subject: Merge again from mainline. X-Git-Tag: v8.1.0~570^2~152 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed584c40ad6f138190316f0500660481042b53f2;p=dealii.git Merge again from mainline. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31034 0785d39b-7218-0410-832d-ea1e28bc413d --- ed584c40ad6f138190316f0500660481042b53f2 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::active_cell_iterator> > coloring( graph_coloring::make_graph_coloring(cell,dof_handler.end(), std_cxx1x::function (typename -- DoFHandler::active_cell_iterator const &)> (get_conflict_indices_cfem))); ++ DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring for (unsigned int color=0; color::active_cell_iterator> > coloring( graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), std_cxx1x::function (typename -- DoFHandler::active_cell_iterator const &)> (get_conflict_indices_cfem))); ++ DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring for (unsigned int color=0; color::active_cell_iterator> > coloring( graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), std_cxx1x::function (typename -- hp::DoFHandler::active_cell_iterator const &)> (get_conflict_indices_cfem))); ++ hp::DoFHandler::active_cell_iterator const &)> (&get_conflict_indices_cfem))); // Output the coloring for (unsigned int color=0; color