From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 13 Sep 2013 21:38:50 +0000 (+0000)
Subject: Another bunch of bugfixes
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c113d174405cc8517cc734611d23a2464af4decc;p=dealii-svn.git

Another bunch of bugfixes

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

diff --git a/tests/mpi/blockvec_01.cc b/tests/mpi/blockvec_01.cc
index 0ed5b503e6..54ff80084b 100644
--- a/tests/mpi/blockvec_01.cc
+++ b/tests/mpi/blockvec_01.cc
@@ -63,7 +63,7 @@ void test ()
   deallog << "size[1]: " << v.block(1).size() << std::endl;
 
   {
-    std::ofstream file (("dat." + Utilities::int_to_string(myid)).c_str());
+    std::ofstream file ((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
 
     file << "**** proc " << myid << std::endl;
     v.print(file);
@@ -75,7 +75,7 @@ void test ()
     {
       for (unsigned int i=0; i<Utilities::MPI::n_mpi_processes (MPI_COMM_WORLD); ++i)
         {
-          cat_file(("dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat.") + Utilities::int_to_string(i)).c_str());
         }
     }
 
diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc
index cf9e1562e9..8c4d72c285 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc
@@ -70,7 +70,7 @@ void test()
   DoFTools::make_hanging_node_constraints (dofh, cm2);
 
   {
-    std::ofstream file((std::string("dat." + Utilities::int_to_string(myid)).c_str());
+    std::ofstream file((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
     file << "**** proc " << myid << std::endl;
     cm.print(file);
     file << "****" << std::endl;
@@ -86,7 +86,7 @@ void test()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat.") + Utilities::int_to_string(i)).c_str());
         }
 
     }
diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc
index b166b2f2d2..c7bab7f9a3 100644
--- a/tests/mpi/p4est_2d_constraintmatrix_03.cc
+++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc
@@ -206,7 +206,7 @@ void test()
 
   if (myid==0)
     {
-      std::ofstream file((std::string("dat." + Utilities::int_to_string(myid)).c_str());
+      std::ofstream file((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
       file << "**** proc " << myid << std::endl;
       x_dub.print(file);
     }
@@ -215,7 +215,7 @@ void test()
 
   if (myid==0)
     {
-      cat_file((std::string("dat." + Utilities::int_to_string(0)).c_str());
+      cat_file((std::string("dat.") + Utilities::int_to_string(0)).c_str());
     }
 
   tr.set_boundary (0);
diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc
index 3acaf35386..57dc4fbc4d 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_01.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc
@@ -80,7 +80,7 @@ void test()
   DoFTools::make_hanging_node_constraints (dofh, cm2);
 
   {
-    std::ofstream file((std::string("dat." + Utilities::int_to_string(myid)).c_str());
+    std::ofstream file((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
     file << "**** proc " << myid << std::endl;
     cm.print(file);
     file << "****" << std::endl;
@@ -96,7 +96,7 @@ void test()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat.") + Utilities::int_to_string(i)).c_str());
         }
 
     }
diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc
index 6db129efac..b7fcb874e3 100644
--- a/tests/mpi/p4est_3d_constraintmatrix_04.cc
+++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc
@@ -73,7 +73,7 @@ void test ()
 
   IndexSet locally_active (dof.n_dofs());
   DoFTools::extract_locally_active_dofs (dof, locally_active);
-  std::ofstream file((std::string("dat." + Utilities::int_to_string(myid)).c_str());
+  std::ofstream file((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
   file << "**** proc " << myid << ": \n\n";
   file << "Constraints:\n";
   constraints.print(file);
@@ -88,7 +88,7 @@ void test ()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file((std::string("dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat.") + Utilities::int_to_string(i)).c_str());
         }
     }
 }
diff --git a/tests/mpi/parallel_partitioner_03.cc b/tests/mpi/parallel_partitioner_03.cc
index 214cd7ba5c..61781c4a42 100644
--- a/tests/mpi/parallel_partitioner_03.cc
+++ b/tests/mpi/parallel_partitioner_03.cc
@@ -63,7 +63,7 @@ void test ()
 
   // write the info on ghost processors and import indices to file
   {
-    std::ofstream file(("dat." + Utilities::int_to_string(myid)).c_str());
+    std::ofstream file((std::string("dat.") + Utilities::int_to_string(myid)).c_str());
     file << "**** proc " << myid << std::endl;
     file << "ghost targets: ";
     for (unsigned int i=0; i<v.ghost_targets().size(); ++i)
@@ -88,7 +88,7 @@ void test ()
     {
       for (unsigned int i=0; i<numproc; ++i)
         {
-          cat_file(("dat." + Utilities::int_to_string(i)).c_str());
+          cat_file((std::string("dat.") + Utilities::int_to_string(i)).c_str());
         }
 
     }