Merge branch 'pybind:master' into master

This commit is contained in:
Steve R. Sun 2022-08-13 09:06:46 +08:00 committed by GitHub
commit c2f9bcdf7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -78,7 +78,7 @@ struct set_caster {
pybind11::set s; pybind11::set s;
for (auto &&value : src) { for (auto &&value : src) {
auto value_ = reinterpret_steal<object>( auto value_ = reinterpret_steal<object>(
key_conv::cast(forward_like<T>(value), policy, parent)); key_conv::cast(detail::forward_like<T>(value), policy, parent));
if (!value_ || !s.add(std::move(value_))) { if (!value_ || !s.add(std::move(value_))) {
return handle(); return handle();
} }
@ -122,9 +122,9 @@ struct map_caster {
} }
for (auto &&kv : src) { for (auto &&kv : src) {
auto key = reinterpret_steal<object>( auto key = reinterpret_steal<object>(
key_conv::cast(forward_like<T>(kv.first), policy_key, parent)); key_conv::cast(detail::forward_like<T>(kv.first), policy_key, parent));
auto value = reinterpret_steal<object>( auto value = reinterpret_steal<object>(
value_conv::cast(forward_like<T>(kv.second), policy_value, parent)); value_conv::cast(detail::forward_like<T>(kv.second), policy_value, parent));
if (!key || !value) { if (!key || !value) {
return handle(); return handle();
} }
@ -178,7 +178,7 @@ public:
ssize_t index = 0; ssize_t index = 0;
for (auto &&value : src) { for (auto &&value : src) {
auto value_ = reinterpret_steal<object>( auto value_ = reinterpret_steal<object>(
value_conv::cast(forward_like<T>(value), policy, parent)); value_conv::cast(detail::forward_like<T>(value), policy, parent));
if (!value_) { if (!value_) {
return handle(); return handle();
} }
@ -242,7 +242,7 @@ public:
ssize_t index = 0; ssize_t index = 0;
for (auto &&value : src) { for (auto &&value : src) {
auto value_ = reinterpret_steal<object>( auto value_ = reinterpret_steal<object>(
value_conv::cast(forward_like<T>(value), policy, parent)); value_conv::cast(detail::forward_like<T>(value), policy, parent));
if (!value_) { if (!value_) {
return handle(); return handle();
} }