Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5f815052b0 into 1f8b4a7f1a

This commit is contained in:
Megh Parikh 2024-09-20 23:42:16 -07:00 committed by GitHub
parent 1f8b4a7f1a 5f815052b0
commit 84d253503c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/pybind11/cast.h
View File

@ -685,23 +685,27 @@ public:
protected: protected:
template <size_t... Is> template <size_t... Is>
type implicit_cast(index_sequence<Is...>) & { type implicit_cast(index_sequence<Is...>) & {
return type(cast_op<Ts>(std::get<Is>(subcasters))...); using std::get;
return type(cast_op<Ts>(get<Is>(subcasters))...);
} }
template <size_t... Is> template <size_t... Is>
type implicit_cast(index_sequence<Is...>) && { type implicit_cast(index_sequence<Is...>) && {
return type(cast_op<Ts>(std::move(std::get<Is>(subcasters)))...); using std::get;
return type(cast_op<Ts>(std::move(get<Is>(subcasters)))...);
} }
static constexpr bool load_impl(const sequence &, bool, index_sequence<>) { return true; } static constexpr bool load_impl(const sequence &, bool, index_sequence<>) { return true; }
template <size_t... Is> template <size_t... Is>
bool load_impl(const sequence &seq, bool convert, index_sequence<Is...>) { bool load_impl(const sequence &seq, bool convert, index_sequence<Is...>) {
using std::get;
#ifdef __cpp_fold_expressions #ifdef __cpp_fold_expressions
if ((... || !std::get<Is>(subcasters).load(seq[Is], convert))) { if ((... || !get<Is>(subcasters).load(seq[Is], convert))) {
return false; return false;
} }
#else #else
for (bool r : {std::get<Is>(subcasters).load(seq[Is], convert)...}) { for (bool r : {get<Is>(subcasters).load(seq[Is], convert)...}) {
if (!r) { if (!r) {
return false; return false;
} }
@ -714,10 +718,11 @@ protected:
template <typename T, size_t... Is> template <typename T, size_t... Is>
static handle static handle
cast_impl(T &&src, return_value_policy policy, handle parent, index_sequence<Is...>) { cast_impl(T &&src, return_value_policy policy, handle parent, index_sequence<Is...>) {
using std::get;
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(src, policy, parent); PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(src, policy, parent);
PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent); PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent);
std::array<object, size> entries{{reinterpret_steal<object>( std::array<object, size> entries{{reinterpret_steal<object>(
make_caster<Ts>::cast(std::get<Is>(std::forward<T>(src)), policy, parent))...}}; make_caster<Ts>::cast(get<Is>(std::forward<T>(src)), policy, parent))...}};
for (const auto &entry : entries) { for (const auto &entry : entries) {
if (!entry) { if (!entry) {
return handle(); return handle();