Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make compile with older compilers #768

Merged
merged 1 commit into from Feb 23, 2016
Merged

Make compile with older compilers #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/aspect/assembly.h
View file
Open in desktop
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion source/postprocess/visualization.cc
View file
Open in desktop
Expand Up @@ -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 +"."));
Expand Down
2 changes: 1 addition & 1 deletion source/utilities.cc
View file
Open in desktop
Expand Up @@ -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 + ">."));

Expand Down