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

[smart_holder] git merge master #5161

Merged
merged 2 commits into from
Jun 11, 2024
Merged

[smart_holder] git merge master #5161

merged 2 commits into from
Jun 11, 2024

Commits on Jun 11, 2024

  1. Fix refcount bug involving trampoline functions with PyObject * ret… 

    …urn type. (pybind#5156)

* Transfer diff from pybind11k fork as-is. New tests are still missing.

* Add `PYBIND11_WARNING_DISABLE_MSVC(4127)` into `PYBIND11_OVERRIDE_IMPL` macro.

* Add test_trampoline_with_pyobject_ptr_return()

* Resolve clang-tidy error: use auto when initializing with a template cast to avoid duplicating the type name [modernize-use-auto,-warnings-as-errors]

* Disabled checking refcount when building with PyPy.

* Clang 3.6, 3.7, 3.9 compatibility.

```
/__w/pybind11/pybind11/tests/test_type_caster_pyobject_ptr.cpp:23:13: error: definition of implicit copy constructor for 'WithPyObjectPtrReturn' is deprecated because it has a user-declared destructor [-Werror,-Wdeprecated]
    virtual ~WithPyObjectPtrReturn() = default;
            ^
```

* Minor clean-up of production code changes.

* Add missing `override` (to resolve clang-tidy error).

* Move PYBIND11_WARNING_POP for a better clang-format outcome.
    Ralf W. Grosse-Kunstleve authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ab955f1 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 Jun 11, 2024
    Configuration menu
    Copy the full SHA
    b739a53 View commit details
    Browse the repository at this point in the history