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 #5204

Merged
merged 4 commits into from
Jun 27, 2024
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Jun 27, 2024

Description

Helper/scratch PR for testing.

Suggested changelog entry:

colesbury and others added 4 commits June 26, 2024 15:46
* Use manual padding of instance_map_shard.

The alignas(64) specifier requires aligned allocation, which is not
available on macOS when targeting versions before 10.14.

* Add 'see pybind#5200'

* Update include/pybind11/detail/internals.h

* Update include/pybind11/detail/internals.h

---------

Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
@rwgk rwgk merged commit 08c83b8 into pybind:smart_holder Jun 27, 2024
152 checks passed
@rwgk rwgk deleted the sh_merge_master branch June 27, 2024 04:39
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.

4 participants