Merge branch 'pybind:master' into master

This commit is contained in:
Steve R. Sun 2023-03-28 08:09:11 +08:00 committed by GitHub
commit 9ac2d0852a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -143,7 +143,7 @@ constexpr descr<N, Ts...> concat(const descr<N, Ts...> &descr) {
return descr; return descr;
} }
#if defined(PYBIND11_CPP17) #ifdef __cpp_fold_expressions
template <size_t N1, size_t N2, typename... Ts1, typename... Ts2> template <size_t N1, size_t N2, typename... Ts1, typename... Ts2>
constexpr descr<N1 + N2 + 2, Ts1..., Ts2...> operator,(const descr<N1, Ts1...> &a, constexpr descr<N1 + N2 + 2, Ts1..., Ts2...> operator,(const descr<N1, Ts1...> &a,
const descr<N2, Ts2...> &b) { const descr<N2, Ts2...> &b) {