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

[Preview 3] Merge smart_holder into master (squash merge) #5339

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Commits on Aug 26, 2024

  1. Snapshot of smart_holder branch @ f99ffd7 (Tue Aug 27 01:56:00 2024 +…

    …0700)
    Ralf W. Grosse-Kunstleve committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6d7e47a View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. [smart_holder] Introduce PYBIND11_SMART_HOLDER_DISABLE option. (pyb…

    …ind#5348)
    
    * Step 1: Establish new `PYBIND11_SMART_HOLDER_ENABLED` macro, but only under include/pybind11/
    
    At the stage `PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT` and `PYBIND11_SMART_HOLDER_ENABLED` are still equivalent.
    
    * Systematically replace all `PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT` with `PYBIND11_SMART_HOLDER_ENABLED` under tests/ and ubench/
    
    As at the previous stage, `PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT` and `PYBIND11_SMART_HOLDER_ENABLED` are still equivalent.
    
    * Introduce `PYBIND11_SMART_HOLDER_DISABLE` option.
    
    * `#ifdef` out entire `wrap()` function to avoid `unused-parameter` warning-as-error under macos-13
    
    ```
    /Users/runner/work/pybind11/pybind11/tests/test_class_sh_trampoline_basic.cpp:67:23: error: unused parameter 'm' [-Werror,-Wunused-parameter]
    void wrap(py::module_ m, const char *py_class_name) {
                          ^
    /Users/runner/work/pybind11/pybind11/tests/test_class_sh_trampoline_basic.cpp:67:38: error: unused parameter 'py_class_name' [-Werror,-Wunused-parameter]
    void wrap(py::module_ m, const char *py_class_name) {
                                         ^
    2 errors generated.
    ```
    Ralf W. Grosse-Kunstleve committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    9be8d84 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into squash_merge_smart_holder_into_master_prev…

    …iew_1
    Ralf W. Grosse-Kunstleve committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    ba62fcd View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into squash_merge_smart_holder_into_master_prev…

    …iew_1
    Ralf W. Grosse-Kunstleve committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    36c319a View commit details
    Browse the repository at this point in the history
  4. Apply ci.yml diff piggy-backed in pybind#5349

    Ralf W. Grosse-Kunstleve committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    1baa98b View commit details
    Browse the repository at this point in the history