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

Commits on Jun 26, 2024

  1. fix: use manual padding of instance_map_shard (google#5200)

    * 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>
    colesbury and henryiii authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2e35470 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4bd538a View commit details
    Browse the repository at this point in the history
  3. docs: prepare for 2.13.1 (google#5203)

    Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
    henryiii authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    57287b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    08c83b8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'sh_merge_master' into pybind11k_merge_sh

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