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

Merged
merged 4 commits into from
Aug 21, 2024
Merged

git merge smart_holder #30149

merged 4 commits into from
Aug 21, 2024

Commits on Aug 18, 2024

  1. Add instance::is_alias and migrate from using `smart_holder::pointe… 

    …e_depends_on_holder_owner` to that. (google#5318)
    Ralf W. Grosse-Kunstleve authored Aug 18, 2024
    Configuration menu
    Copy the full SHA
    4672f2b View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. fix: never use .. in a header include (google#5321) 

    * fix: never use `..` in a header include

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

* fix: one more parent include

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

---------

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

  2. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8449595 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sh_merge_master' into pybind11k_merge_sh

    Ralf W. Grosse-Kunstleve committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    4fadc63 View commit details
    Browse the repository at this point in the history