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

[smart_holder] git merge master #3653

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Jan 27, 2022

Description

Helper/scratch PR for testing.

Suggested changelog entry:

* Add tests demonstrating smart_holder issues with multiple inheritance

* Propagate C++ multiple inheritance markers to all children

- Makes py::multiple_inheritance only needed in base classes hidden from pybind11
@rwgk rwgk merged commit aa4fe8e into pybind:smart_holder Jan 27, 2022
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Jan 27, 2022
@rwgk rwgk deleted the sh_merge_master branch January 27, 2022 04:26
@henryiii henryiii removed the needs changelog Possibly needs a changelog entry label Jan 31, 2022
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.

3 participants