Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-03-03 04:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict error

Browse Source
This commit is contained in:
Aaron Gokaslan 2022-03-02 13:22:44 -05:00
parent 6523bc2127
commit 6c6971fc30
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pybind11/detail/type_caster_base.h
View File

@ -510,7 +510,6 @@ error_string(PyObject *exc_type, PyObject *exc_value, PyObject *exc_trace) {
result += "): "; result += "): ";
result += handle(f_code->co_name).cast<std::string>(); result += handle(f_code->co_name).cast<std::string>();
result += '\n'; result += '\n';
frame = frame->f_back;
Py_DECREF(f_code); Py_DECREF(f_code);
# if PY_VERSION_HEX >= 0x030900B1 # if PY_VERSION_HEX >= 0x030900B1
auto *b_frame = PyFrame_GetBack(frame); auto *b_frame = PyFrame_GetBack(frame);