[smart_holder] Fix terrible merge accident: PYBIND11_INTERNALS_SH_DEF missing in PYBIND11_INTERNALS_ID and PYBIND11_MODULE_LOCAL_ID
#5159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_DEFAULT"` for new `manylinux` job (Manylinux on 🐍 3.13t • GIL).
rwgk
changed the title
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" (manylinux)PYBIND11_INTERNALS_SH_DEF missing in PYBIND11_INTERNALS_ID and PYBIND11_MODULE_LOCAL_ID
…TERNALS_SH_DEF` was accidentally removed from `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID`.
rwgk
pushed a commit
to google/pybind11clif
that referenced
this pull request
Jun 11, 2024
git merge smart_holder (pybind/pybind11#5159)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes two oversights:
PYBIND11_INTERNALS_SH_DEFwas accidentally removed fromPYBIND11_INTERNALS_IDandPYBIND11_MODULE_LOCAL_ID. — How did this happen? First PR chore(deps): update pre-commit hooks #5084 on master introduced whitespace changes:Those were incorrectly applied in smart_holder PR #5085:
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"(manylinux)Validation of both fixes:
ci.yml manylinux:
ci_sh_def.yml manylinux:
Suggested changelog entry: