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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 11, 2024
Merged

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

merged 2 commits into from
Jun 11, 2024
+31 −22

Commits on Jun 11, 2024

  1. [smart_holder] Fix terrible merge accident: `PYBIND11_INTERNALS_SH_DE… 

    …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`.
    Ralf W. Grosse-Kunstleve authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    21d81fc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'smart_holder' into pybind11k_merge_sh

    Ralf W. Grosse-Kunstleve committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    7854fb2 View commit details
    Browse the repository at this point in the history