Skip to content

PYBIND11_OBJECT_CVT should use namespace for error_already_set() #3797

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

Merged
rwgk merged 7 commits into from
Mar 11, 2022
Merged

PYBIND11_OBJECT_CVT should use namespace for error_already_set() #3797

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa3b9c6
PYBIND11_OBJECT_CVT should use namespace for error_already_set()
oleksandr-pavlyk Mar 11, 2022
263c881
added test for use of PYBIND11_OBJECT_CVT for classes in external to …
oleksandr-pavlyk Mar 11, 2022
e44607f
Extended test_pytypes.cpp and test_pytest.py
oleksandr-pavlyk Mar 11, 2022
bed5981
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 11, 2022
5b38d11
fixed issues pointed out by CI
oleksandr-pavlyk Mar 11, 2022
ed90b83
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 11, 2022
f7062b3
fixed memory leak in default constructor
oleksandr-pavlyk Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/pybind11/pytypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,12 +1038,12 @@ public:
Name(const object &o) \
: Parent(check_(o) ? o.inc_ref().ptr() : ConvertFun(o.ptr()), stolen_t{}) { \
if (!m_ptr) \
throw error_already_set(); \
throw ::pybind11::error_already_set(); \
} \
/* NOLINTNEXTLINE(google-explicit-constructor) */ \
Name(object &&o) : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) { \
if (!m_ptr) \
throw error_already_set(); \
throw ::pybind11::error_already_set(); \
}

#define PYBIND11_OBJECT_CVT_DEFAULT(Name, Parent, CheckFun, ConvertFun) \
Expand Down