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] Simplification: Enable smart_holder functionality unconditionally. #5531

Merged
merged 15 commits into from
Feb 22, 2025

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Feb 18, 2025

Description

Follow-on to PR #5530 on master.

Now that we don't have to worry about PYBIND11_INTERNALS_VERSIONs 4 and 5 anymore, a lot of #ifdef clutter can be removed from the smart_holder branch.

This PR has NO FUNCTIONAL CHANGES in the code that remains, it only removes obsolete functionality.

This PR does NOT change the PYBIND11_INTERNALS_VERSION on the smart_holder branch. This is left for the follow-on PR #5541, which removes the obsolete pybind11::detail::type_info::default_holder member.

Notes:

Suggested changelog entry:

@rwgk rwgk changed the title [smart_holder][WIP] Simplification: Enable smart_holder functionality unconditionally. [smart_holder] Simplification: Enable smart_holder functionality unconditionally. Feb 22, 2025
@rwgk
Copy link
Collaborator Author

rwgk commented Feb 22, 2025

I'm ignoring this failure:

🐍 3.12 • macos-13 • x64 -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"

It is just a catch2 download error.

@rwgk rwgk marked this pull request as ready for review February 22, 2025 18:18
@rwgk rwgk requested a review from henryiii as a code owner February 22, 2025 18:18
@rwgk rwgk merged commit 5ab036b into pybind:smart_holder Feb 22, 2025
79 of 80 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Feb 22, 2025
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Feb 22, 2025
@rwgk rwgk deleted the sh_internals_version_7 branch February 22, 2025 18:24
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.

1 participant