Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git merge smart_holder (Fix git merge accident (pybind11/detail/descr.h)). #30116

Merged
merged 2 commits into from
Apr 2, 2024
Merged

git merge smart_holder (Fix git merge accident (pybind11/detail/descr.h)). #30116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
704a1da
Fix merge accident in pybind11/detail/descr.h
Apr 2, 2024
7c60e86
Merge branch 'sh_fix_merge_accident' into sh_fix_merge_accident_pybin…
Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/pybind11/detail/descr.h
View file
Open in desktop
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
Loading