Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-13 17:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Experiment: undoing even more."

Browse Source 
This reverts commit 59bc2e183e7aef5e45c06aed6965de0ac52d7b06.
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-06 16:12:07 -07:00 committed by Ralf W. Grosse-Kunstleve
parent 5f92b4ff1c
commit a6abb7cff1
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pybind11/detail/smart_holder_type_casters.h
View File

@ -277,12 +277,10 @@ struct smart_holder_type_caster_class_hooks : smart_holder_type_caster_base_tag
using holder_type = pybindit::memory::smart_holder; using holder_type = pybindit::memory::smart_holder;
#ifdef JUNK
template <typename WrappedType> template <typename WrappedType>
static bool try_initialization_using_shared_from_this(holder_type *, WrappedType *, ...) { static bool try_initialization_using_shared_from_this(holder_type *, WrappedType *, ...) {
return false; return false;
} }
#endif
#ifdef JUNK #ifdef JUNK
template <typename WrappedType, typename AnyBaseOfWrappedType> template <typename WrappedType, typename AnyBaseOfWrappedType>
@ -316,12 +314,10 @@ struct smart_holder_type_caster_class_hooks : smart_holder_type_caster_base_tag
auto holder_ptr = static_cast<holder_type *>(holder_void_ptr); auto holder_ptr = static_cast<holder_type *>(holder_void_ptr);
new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(*holder_ptr)); new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(*holder_ptr));
} else { } else {
#ifdef JUNK
if (!try_initialization_using_shared_from_this( if (!try_initialization_using_shared_from_this(
std::addressof(v_h.holder<holder_type>()), std::addressof(v_h.holder<holder_type>()),
v_h.value_ptr<WrappedType>(), v_h.value_ptr<WrappedType>(),
v_h.value_ptr<WrappedType>())) { v_h.value_ptr<WrappedType>())) {
#endif
if (inst->owned) { if (inst->owned) {
new (std::addressof(v_h.holder<holder_type>())) holder_type( new (std::addressof(v_h.holder<holder_type>())) holder_type(
holder_type::from_raw_ptr_take_ownership(v_h.value_ptr<WrappedType>())); holder_type::from_raw_ptr_take_ownership(v_h.value_ptr<WrappedType>()));
@ -329,9 +325,7 @@ struct smart_holder_type_caster_class_hooks : smart_holder_type_caster_base_tag
new (std::addressof(v_h.holder<holder_type>())) holder_type( new (std::addressof(v_h.holder<holder_type>())) holder_type(
holder_type::from_raw_ptr_unowned(v_h.value_ptr<WrappedType>())); holder_type::from_raw_ptr_unowned(v_h.value_ptr<WrappedType>()));
} }
#ifdef JUNK
} }
#endif
} }
v_h.holder<holder_type>().pointee_depends_on_holder_owner v_h.holder<holder_type>().pointee_depends_on_holder_owner
= dynamic_raw_ptr_cast_if_possible<AliasType>(v_h.value_ptr<WrappedType>()) != nullptr; = dynamic_raw_ptr_cast_if_possible<AliasType>(v_h.value_ptr<WrappedType>()) != nullptr;