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

git merge smart_holder (pybind/pybind11#5159) #30123

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Jun 11, 2024

Description

Corresponding to pybind/pybind11#5159, but the internals.h bug never existed on the pybind11clif main branch (because the corresponding code lives in pybind11/detail/abi_platform_id.h).

Suggested changelog entry:

Ralf W. Grosse-Kunstleve added 2 commits June 10, 2024 18:20
…F` missing in `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID` (google#5159)

* Fix oversight: Add `-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"` for new `manylinux` job (Manylinux on 🐍 3.13t • GIL).

* Fix terrible merge accident introduced with pybind/pybind11#5085: `PYBIND11_INTERNALS_SH_DEF` was accidentally removed from `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID`.
@rwgk rwgk marked this pull request as ready for review June 11, 2024 14:21
@rwgk rwgk merged commit d608250 into google:main Jun 11, 2024
145 checks passed
@rwgk rwgk deleted the pybind11k_merge_sh branch June 11, 2024 14:22
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