From 0fb1cde5e6a8e871e5a47009e476d41166e07eb7 Mon Sep 17 00:00:00 2001 From: Ian Rose Date: Tue, 23 Feb 2016 10:13:03 -0800 Subject: [PATCH] Make compile with older compilers --- include/aspect/assembly.h | 6 +++--- source/postprocess/visualization.cc | 2 +- source/utilities.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/aspect/assembly.h b/include/aspect/assembly.h index 7299aa21402..2ee8e5d446a 100644 --- a/include/aspect/assembly.h +++ b/include/aspect/assembly.h @@ -123,9 +123,9 @@ namespace aspect FEValues finite_element_values; - std::shared_ptr > face_finite_element_values; - std::shared_ptr > neighbor_face_finite_element_values; - std::shared_ptr > subface_finite_element_values; + std_cxx11::shared_ptr > face_finite_element_values; + std_cxx11::shared_ptr > neighbor_face_finite_element_values; + std_cxx11::shared_ptr > subface_finite_element_values; std::vector local_dof_indices; diff --git a/source/postprocess/visualization.cc b/source/postprocess/visualization.cc index 099a1e4e375..0cb0c6f913e 100644 --- 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 index d4064c240e7..c9b2d6a0748 100644 --- 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 + ">."));