Merge pull request #768 from ian-r-rose/c++03_fixes

Make compile with older compilers
geodynamics · Feb 23, 2016 · 5aada1c · 5aada1c
2 parents 89d7e11 + 0fb1cde
commit 5aada1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/include/aspect/assembly.h b/include/aspect/assembly.h
@@ -123,9 +123,9 @@ namespace aspect
 
           FEValues<dim>               finite_element_values;
 
-          std::shared_ptr<FEFaceValues<dim> >           face_finite_element_values;
-          std::shared_ptr<FEFaceValues<dim> >           neighbor_face_finite_element_values;
-          std::shared_ptr<FESubfaceValues<dim> >        subface_finite_element_values;
+          std_cxx11::shared_ptr<FEFaceValues<dim> >           face_finite_element_values;
+          std_cxx11::shared_ptr<FEFaceValues<dim> >           neighbor_face_finite_element_values;
+          std_cxx11::shared_ptr<FESubfaceValues<dim> >        subface_finite_element_values;
 
           std::vector<types::global_dof_index>   local_dof_indices;
 

diff --git a/source/postprocess/visualization.cc b/source/postprocess/visualization.cc
@@ -524,7 +524,7 @@ namespace aspect
                                        DataOutBase::default_suffix
                                        (DataOutBase::parse_output_format(output_format));
 
-          std::ofstream out (filename);
+          std::ofstream out (filename.c_str());
 
           AssertThrow(out,
                       ExcMessage("Unable to open file for writing: " + filename +"."));

diff --git a/source/utilities.cc b/source/utilities.cc
@@ -113,7 +113,7 @@ namespace aspect
 
       if (Utilities::MPI::this_mpi_process(comm) == 0)
         {
-          std::ifstream filestream(filename);
+          std::ifstream filestream(filename.c_str());
           AssertThrow (filestream,
                        ExcMessage (std::string("Could not open file <") + filename + ">."));