From: Matthias Maier Date: Sat, 5 Oct 2013 11:46:11 +0000 (+0000) Subject: Make clang happy X-Git-Tag: v8.1.0~570^2~105 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f23dc99ea25002157f9fab0940902a68f84162a;p=dealii.git Make clang happy git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31142 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/mpi/coarse_grid_common.h b/tests/mpi/coarse_grid_common.h index 8590520d62..9c915f0c27 100644 --- a/tests/mpi/coarse_grid_common.h +++ b/tests/mpi/coarse_grid_common.h @@ -31,14 +31,12 @@ template void write_vtk (const parallel::distributed::Triangulation &tria, - const char *dirname, const char *filename) { deallog << "Checksum: " << tria.get_checksum () << std::endl; - chdir (dirname); tria.write_mesh_vtk (filename); if (false) @@ -71,20 +69,17 @@ void write_vtk (const parallel::distributed::Triangulation &tria, } } } - - - chdir (".."); } template -void assert_tria_equal(const char *testdir, const Triangulation &a, const Triangulation &b) +void assert_tria_equal(const Triangulation &a, const Triangulation &b) { Assert (a.n_active_cells() == b.n_active_cells(), ExcInternalError()); - std::string file1=std::string(testdir)+"/tmp_grid1"; - std::string file2=std::string(testdir)+"/tmp_grid2"; + std::string file1 = "tmp_grid1"; + std::string file2 = "tmp_grid2"; std::ofstream out1(file1.c_str()); GridOut().write_gnuplot (a, out1); @@ -113,3 +108,14 @@ operator << (LogStream &out, out << v[i] << (i == v.size()-1 ? "" : " "); return out; } + + +template +std::ostringstream & +operator << (std::ostringstream &out, + const std::vector &v) +{ + for (unsigned int i=0; i