From a6923626c04eb2db40409dcac9d7256e5d935e51 Mon Sep 17 00:00:00 2001 From: Aaron Gokaslan Date: Sun, 13 Feb 2022 13:23:40 -0500 Subject: [PATCH] Fix more merge errors --- include/pybind11/detail/type_caster_base.h | 4 ++-- include/pybind11/pytypes.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/pybind11/detail/type_caster_base.h b/include/pybind11/detail/type_caster_base.h index 4a22eb5cc..9e1ed6c9c 100644 --- a/include/pybind11/detail/type_caster_base.h +++ b/include/pybind11/detail/type_caster_base.h @@ -501,9 +501,9 @@ PYBIND11_NOINLINE std::string error_string(PyObject *type, PyObject *value, PyOb Py_INCREF(f_code); # endif int lineno = PyFrame_GetLineNumber(frame); - result += " " + handle(f_code->co_filename).cast() + "(" + result += std::string(" ") + handle(f_code->co_filename).cast() + '(' + std::to_string(lineno) - + "): " + handle(f_code->co_name).cast() + "\n"; + + "): " + handle(f_code->co_name).cast() + '\n'; frame = frame->f_back; Py_DECREF(f_code); } diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h index 000689576..0773b3678 100644 --- a/include/pybind11/pytypes.h +++ b/include/pybind11/pytypes.h @@ -363,8 +363,8 @@ T reinterpret_steal(handle h) { } PYBIND11_NAMESPACE_BEGIN(detail) -inline std::string error_string(); -inline std::string error_string(PyObject *, PyObject *, PyObject *); +std::string error_string(); +std::string error_string(PyObject *, PyObject *, PyObject *); PYBIND11_NAMESPACE_END(detail) #if defined(_MSC_VER)