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

Merged
merged 5 commits into from
Jun 27, 2024
Merged

git merge smart_holder #30134

merged 5 commits into from
Jun 27, 2024

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Jun 27, 2024

Description

Helper/scratch PR for testing.

Corresponding to: pybind/pybind11#5204

Suggested changelog entry:

colesbury and others added 5 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 google#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>
Copy link

google-cla bot commented Jun 27, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@rwgk rwgk marked this pull request as ready for review June 27, 2024 04:41
@rwgk rwgk merged commit b6032da into google:main Jun 27, 2024
147 checks passed
@rwgk rwgk deleted the pybind11k_merge_sh branch June 27, 2024 04:41
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