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

chore: add err guard to capsule destructor and add a move to iostream #3958

Merged
merged 8 commits into from
May 27, 2022
Merged

chore: add err guard to capsule destructor and add a move to iostream #3958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac64d55
Add err guard to capsule destructor
Skylion007 May 18, 2022
5d64a44
only uses ostream currently
Skylion007 May 18, 2022
bf53094
can these be noexcept
Skylion007 May 18, 2022
a84e7ae
Add back header
Skylion007 May 18, 2022
dee7918
fix for older compilers
Skylion007 May 18, 2022
878059a
This should at least be noexcept
Skylion007 May 18, 2022
4b1a650
Add missing move
Skylion007 May 18, 2022
a27914a
Apparently not noexcept for old llvm
Skylion007 May 18, 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
2 changes: 1 addition & 1 deletion include/pybind11/iostream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class pythonbuf : public std::streambuf {

if (size > remainder) {
str line(pbase(), size - remainder);
pywrite(line);
pywrite(std::move(line));
pyflush();
}

Expand Down
2 changes: 2 additions & 0 deletions include/pybind11/pytypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,8 @@ class capsule : public object {

capsule(const void *value, void (*destructor)(void *)) {
m_ptr = PyCapsule_New(const_cast<void *>(value), nullptr, [](PyObject *o) {
// guard if destructor called while err indicator is set
error_scope error_guard;
auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));
if (destructor == nullptr) {
if (PyErr_Occurred()) {
Expand Down