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.

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

fixes to compile without cxx11 #1267

Merged
merged 1 commit into from Nov 3, 2016
Merged

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented Nov 3, 2016

  1. boost::scoped_ptr can not be returned from a function
  2. std::multimap::insert(hint) takes a non-const iterator pre cxx11

1. boost::scoped_ptr can not be returned from a function
2. std::multimap::insert(hint) takes a non-const iterator pre cxx11
@bangerth bangerth merged commit 6e3a937 into geodynamics:master Nov 3, 2016
std_cxx11::unique_ptr<Mapping<dim> > construct_mapping(const GeometryModel::Interface<dim> &geometry_model,
const InitialTopographyModel::Interface<dim> &initial_topography_model)
Mapping<dim> *construct_mapping(const GeometryModel::Interface<dim> &geometry_model,
const InitialTopographyModel::Interface<dim> &initial_topography_model)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, bummer. We went around this so many times to make the semantics obvious when @gassmoeller implemented it. It is so elegant with the unique-ptr...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. The problem is that scoped_ptr is not a drop-in replacement for unique_ptr. We could have switched to a shared_ptr here, I guess.

@tjhei tjhei deleted the no_cxx11_fixes branch November 3, 2016 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants