From: Wolfgang Bangerth Date: Fri, 20 Sep 2013 23:27:40 +0000 (+0000) Subject: Merge from mainline. X-Git-Tag: v8.1.0~570^2~226 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84839d043790f6ffb1a282ec7c322f30f18cf2b2;p=dealii.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30879 0785d39b-7218-0410-832d-ea1e28bc413d --- 84839d043790f6ffb1a282ec7c322f30f18cf2b2 diff --cc tests/base/graph_coloring_03.cc index 61b6000529,9d0a0f9d8d..2d7f56d8b2 --- a/tests/base/graph_coloring_03.cc +++ b/tests/base/graph_coloring_03.cc @@@ -59,7 -69,8 +69,8 @@@ void check( // Create the coloring std::vector::active_cell_iterator> > coloring( - graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end())); + graph_coloring::make_graph_coloring(dof_handler.begin_active(),dof_handler.end(), - get_conflict_indices_cfem)); ++ get_conflict_indices_cfem)); // Output the coloring for (unsigned int color=0; color