Skip to content

Commit

Permalink
Fix merge accident in pybind11/detail/descr.h (google#5086)
Browse files Browse the repository at this point in the history
This was noticed only when manually reviewing the diffs with the Google review tools.
  • Loading branch information
rwgk committed Apr 2, 2024
1 parent 08a97da commit cfe7356
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/pybind11/detail/descr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit cfe7356

Please sign in to comment.