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

Restoring init_holder overload for std::enable_shared_from_this and original tests/test_smart_ptr.py.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-01 13:17:05 -07:00 committed by Ralf W. Grosse-Kunstleve
parent e5b38a4459
commit 7a74bfede7
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/pybind11.h
View File

@ -1577,7 +1577,6 @@ private:
}
// clang-format off
#ifdef JUNK
/// Initialize holder object, variant 1: object derives from enable_shared_from_this
template <typename T>
static void init_holder(detail::instance *inst, detail::value_and_holder &v_h,
@ -1595,7 +1594,6 @@ private:
v_h.set_holder_constructed();
}
}
#endif
static void init_holder_from_existing(const detail::value_and_holder &v_h,
const holder_type *holder_ptr, std::true_type /*is_copy_constructible*/) {

16
tests/test_smart_ptr.py
View File

@ -205,11 +205,9 @@ def test_shared_ptr_from_this_and_references():
ref = s.ref # init_holder_helper(holder_ptr=false, owned=false, bad_wp=false)
assert stats.alive() == 2
assert s.set_ref(ref)
# assert s.set_holder(
# ref
# ) # std::enable_shared_from_this can create a holder from a reference
# RuntimeError: Unable to cast from non-held to held instance (T& to Holder<T>) of type
# 'std::shared_ptr<(anonymous namespace)::SharedFromThisRef::B>''
assert s.set_holder(
ref
) # std::enable_shared_from_this can create a holder from a reference
bad_wp = s.bad_wp # init_holder_helper(holder_ptr=false, owned=false, bad_wp=true)
assert stats.alive() == 2
@ -228,18 +226,14 @@ def test_shared_ptr_from_this_and_references():
) # init_holder_helper(holder_ptr=true, owned=false, bad_wp=false)
assert stats.alive() == 3
assert s.set_ref(holder_ref)
# assert s.set_holder(holder_ref)
# RuntimeError: Unable to cast from non-held to held instance (T& to Holder<T>) of type
# 'std::shared_ptr<(anonymous namespace)::SharedFromThisRef::B>''
assert s.set_holder(holder_ref)
holder_copy = (
s.holder_copy
) # init_holder_helper(holder_ptr=true, owned=true, bad_wp=false)
assert stats.alive() == 3
assert s.set_ref(holder_copy)
# assert s.set_holder(holder_copy)
# RuntimeError: Unable to cast from non-held to held instance (T& to Holder<T>) of type
# 'std::shared_ptr<(anonymous namespace)::SharedFromThisRef::B>''
assert s.set_holder(holder_copy)
del ref, bad_wp, copy, holder_ref, holder_copy, s
assert stats.alive() == 0