Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-20 09:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Micro-scale cleanup/consolidation.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2024-07-07 06:58:07 -07:00
parent 1fbc4a2f54
commit 103666ad40
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/pybind11/cast.h
View File

@ -900,8 +900,12 @@ protected:
friend class type_caster_generic; friend class type_caster_generic;
void check_holder_compat() {} void check_holder_compat() {}
void load_value_shared_ptr(const value_and_holder &v_h) { void load_value(value_and_holder &&v_h) {
if (v_h.holder_constructed()) { if (typeinfo->default_holder) {
sh_load_helper.loaded_v_h = v_h;
type_caster_generic::load_value(std::move(v_h));
return;
} else if (v_h.holder_constructed()) {
value = v_h.value_ptr(); value = v_h.value_ptr();
shared_ptr_holder = v_h.template holder<std::shared_ptr<type>>(); shared_ptr_holder = v_h.template holder<std::shared_ptr<type>>();
return; return;
@ -916,15 +920,6 @@ protected:
#endif #endif
} }
void load_value(value_and_holder &&v_h) {
if (typeinfo->default_holder) {
sh_load_helper.loaded_v_h = v_h;
type_caster_generic::load_value(std::move(v_h));
return;
}
load_value_shared_ptr(v_h);
}
template <typename T = std::shared_ptr<type>, template <typename T = std::shared_ptr<type>,
detail::enable_if_t<!std::is_constructible<T, const T &, type *>::value, int> = 0> detail::enable_if_t<!std::is_constructible<T, const T &, type *>::value, int> = 0>
bool try_implicit_casts(handle, bool) { bool try_implicit_casts(handle, bool) {
@ -934,24 +929,17 @@ protected:
template <typename T = std::shared_ptr<type>, template <typename T = std::shared_ptr<type>,
detail::enable_if_t<std::is_constructible<T, const T &, type *>::value, int> = 0> detail::enable_if_t<std::is_constructible<T, const T &, type *>::value, int> = 0>
bool try_implicit_casts(handle src, bool convert) { bool try_implicit_casts(handle src, bool convert) {
if (typeinfo->default_holder) {
for (auto &cast : typeinfo->implicit_casts) { for (auto &cast : typeinfo->implicit_casts) {
copyable_holder_caster sub_caster(*cast.first); copyable_holder_caster sub_caster(*cast.first);
if (sub_caster.load(src, convert)) { if (sub_caster.load(src, convert)) {
value = cast.second(sub_caster.value); value = cast.second(sub_caster.value);
if (typeinfo->default_holder) {
// BAKEIN_WIP: Copy pointer only? // BAKEIN_WIP: Copy pointer only?
sh_load_helper.loaded_v_h = sub_caster.sh_load_helper.loaded_v_h; sh_load_helper.loaded_v_h = sub_caster.sh_load_helper.loaded_v_h;
return true; } else {
}
}
return false;
}
for (auto &cast : typeinfo->implicit_casts) {
copyable_holder_caster sub_caster(*cast.first);
if (sub_caster.load(src, convert)) {
value = cast.second(sub_caster.value);
shared_ptr_holder shared_ptr_holder
= std::shared_ptr<type>(sub_caster.shared_ptr_holder, (type *) value); = std::shared_ptr<type>(sub_caster.shared_ptr_holder, (type *) value);
}
return true; return true;
} }
} }