Skip to content

Commit

Permalink
Remove cxx14
Browse files Browse the repository at this point in the history
  • Loading branch information
anne-glerum committed Feb 24, 2022
1 parent 3361fdf commit e87edc1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion source/heating_model/latent_heat_melt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ namespace aspect
{
const unsigned int n_points = outputs.densities.size();
outputs.additional_outputs.push_back(
std_cxx14::make_unique<MaterialModel::EnthalpyOutputs<dim> > (n_points));
std::make_unique<MaterialModel::EnthalpyOutputs<dim> > (n_points));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/material_model/melt_boukare.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1237,14 +1237,14 @@ namespace aspect
{
const unsigned int n_points = out.viscosities.size();
out.additional_outputs.push_back(
std_cxx14::make_unique<MaterialModel::ReactionRateOutputs<dim> > (n_points, this->n_compositional_fields()));
std::make_unique<MaterialModel::ReactionRateOutputs<dim> > (n_points, this->n_compositional_fields()));
}

if (out.template get_additional_output<BoukareOutputs<dim> >() == nullptr)
{
const unsigned int n_points = out.viscosities.size();
out.additional_outputs.push_back(
std_cxx14::make_unique<MaterialModel::BoukareOutputs<dim>> (n_points));
std::make_unique<MaterialModel::BoukareOutputs<dim>> (n_points));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/material_model/melt_phipps_morgan.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1363,14 +1363,14 @@ namespace aspect
{
const unsigned int n_points = out.viscosities.size();
out.additional_outputs.push_back(
std_cxx14::make_unique<MaterialModel::ReactionRateOutputs<dim> > (n_points, this->n_compositional_fields()));
std::make_unique<MaterialModel::ReactionRateOutputs<dim> > (n_points, this->n_compositional_fields()));
}

if (out.template get_additional_output<PhippsMorganOutputs<dim> >() == nullptr)
{
const unsigned int n_points = out.viscosities.size();
out.additional_outputs.push_back(
std_cxx14::make_unique<MaterialModel::PhippsMorganOutputs<dim>> (n_points));
std::make_unique<MaterialModel::PhippsMorganOutputs<dim>> (n_points));
}
}
}
Expand Down

0 comments on commit e87edc1

Please sign in to comment.