Fix merge accident in pybind11/detail/descr.h (#5086)

This was noticed only when manually reviewing the diffs with the Google review tools.
This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-04-02 11:11:44 -07:00 committed by GitHub
parent 08a97daf32
commit cfe73560a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -259,7 +259,8 @@ template <size_t N, typename... Ts, typename... Args>
constexpr auto concat(const descr<N, Ts...> &d,
const Args &...args) -> decltype(std::declval<descr<N + 2, Ts...>>()
+ concat(args...)) {
return d + const_name(", ") + concat(args...);
// Ensure that src_loc of existing descr is used.
return d + const_name(", ", src_loc{nullptr, 0}) + concat(args...);
}
#endif