Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-23 17:09:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more merge errors

Browse Source
This commit is contained in:
Aaron Gokaslan 2022-02-13 13:23:40 -05:00
parent dbb3e6bf8a
commit a6923626c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,9 +501,9 @@ PYBIND11_NOINLINE std::string error_string(PyObject *type, PyObject *value, PyOb
Py_INCREF(f_code); Py_INCREF(f_code);
# endif # endif
int lineno = PyFrame_GetLineNumber(frame); int lineno = PyFrame_GetLineNumber(frame);
result += " " + handle(f_code->co_filename).cast<std::string>() + "(" result += std::string(" ") + handle(f_code->co_filename).cast<std::string>() + '('
+ std::to_string(lineno) + std::to_string(lineno)
+ "): " + handle(f_code->co_name).cast<std::string>() + "\n"; + "): " + handle(f_code->co_name).cast<std::string>() + '\n';
frame = frame->f_back; frame = frame->f_back;
Py_DECREF(f_code); Py_DECREF(f_code);
} }

4
include/pybind11/pytypes.h
View File

@ -363,8 +363,8 @@ T reinterpret_steal(handle h) {
} }
PYBIND11_NAMESPACE_BEGIN(detail) PYBIND11_NAMESPACE_BEGIN(detail)
inline std::string error_string(); std::string error_string();
inline std::string error_string(PyObject *, PyObject *, PyObject *); std::string error_string(PyObject *, PyObject *, PyObject *);
PYBIND11_NAMESPACE_END(detail) PYBIND11_NAMESPACE_END(detail)
#if defined(_MSC_VER) #if defined(_MSC_VER)