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

rwgk · web-flow · commit cfe73560a252 · 2024-04-02T11:11:44.000-07:00
This was noticed only when manually reviewing the diffs with the Google review tools.
diff --git a/include/pybind11/detail/descr.h b/include/pybind11/detail/descr.h
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,8 @@ template <size_t N, typename... Ts, typename... Args>`
`259`	`259`	`constexpr auto concat(const descr<N, Ts...> &d,`
`260`	`260`	`const Args &...args) -> decltype(std::declval<descr<N + 2, Ts...>>()`
`261`	`261`	`+ concat(args...)) {`
`262`		`- return d + const_name(", ") + concat(args...);`
	`262`	`+ // Ensure that src_loc of existing descr is used.`
	`263`	`+ return d + const_name(", ", src_loc{nullptr, 0}) + concat(args...);`
`263`	`264`	`}`
`264`	`265`	`#endif`
`265`	`266`