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

[smart_holder] git merge master #5161

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Jun 11, 2024

Description

Helper/scratch PR for testing.

Suggested changelog entry:

Ralf W. Grosse-Kunstleve added 2 commits June 11, 2024 14:00
…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.
@rwgk rwgk merged commit b739a53 into pybind:smart_holder Jun 11, 2024
150 checks passed
@rwgk rwgk deleted the sh_merge_master branch June 11, 2024 23:11
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Jun 11, 2024
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Jun 12, 2024
rwgk pushed a commit to google/pybind11clif that referenced this pull request Jun 12, 2024
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.

1 participant