mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-11 16:13:53 +00:00
Retrieving smart_holder pointer in type_caster<std::shared_ptr<mpty[ const]>>::load, and using it cast_op operators.
This commit is contained in:
parent
3f7a1a1b30
commit
4a879cfdcb
@ -27,8 +27,8 @@ std::string pass_mpty_mptr(mpty* obj) { return "pass_mptr:" + obj->mtxt; }
|
|||||||
std::shared_ptr<mpty> rtrn_mpty_shmp() { return std::shared_ptr<mpty>(new mpty); }
|
std::shared_ptr<mpty> rtrn_mpty_shmp() { return std::shared_ptr<mpty>(new mpty); }
|
||||||
std::shared_ptr<mpty const> rtrn_mpty_shcp() { return std::shared_ptr<mpty const>(new mpty); }
|
std::shared_ptr<mpty const> rtrn_mpty_shcp() { return std::shared_ptr<mpty const>(new mpty); }
|
||||||
|
|
||||||
const char* pass_mpty_shmp(std::shared_ptr<mpty>) { return "load_shmp"; }
|
std::string pass_mpty_shmp(std::shared_ptr<mpty> obj) { return "pass_shmp:" + obj->mtxt; }
|
||||||
const char* pass_mpty_shcp(std::shared_ptr<mpty const>) { return "load_shcp"; }
|
std::string pass_mpty_shcp(std::shared_ptr<mpty const> obj) { return "pass_shcp:" + obj->mtxt; }
|
||||||
|
|
||||||
std::unique_ptr<mpty> rtrn_mpty_uqmp() { return std::unique_ptr<mpty>(new mpty); }
|
std::unique_ptr<mpty> rtrn_mpty_uqmp() { return std::unique_ptr<mpty>(new mpty); }
|
||||||
std::unique_ptr<mpty const> rtrn_mpty_uqcp() { return std::unique_ptr<mpty const>(new mpty); }
|
std::unique_ptr<mpty const> rtrn_mpty_uqcp() { return std::unique_ptr<mpty const>(new mpty); }
|
||||||
@ -117,7 +117,7 @@ struct type_caster<mpty> : smart_holder_type_caster_load<mpty> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
struct type_caster<std::shared_ptr<mpty>> {
|
struct type_caster<std::shared_ptr<mpty>> : smart_holder_type_caster_load<mpty> {
|
||||||
static constexpr auto name = _<std::shared_ptr<mpty>>();
|
static constexpr auto name = _<std::shared_ptr<mpty>>();
|
||||||
|
|
||||||
static handle cast(const std::shared_ptr<mpty>& /*src*/,
|
static handle cast(const std::shared_ptr<mpty>& /*src*/,
|
||||||
@ -128,16 +128,11 @@ struct type_caster<std::shared_ptr<mpty>> {
|
|||||||
|
|
||||||
template <typename> using cast_op_type = std::shared_ptr<mpty>;
|
template <typename> using cast_op_type = std::shared_ptr<mpty>;
|
||||||
|
|
||||||
operator std::shared_ptr<mpty>() { return rtrn_mpty_shmp(); }
|
operator std::shared_ptr<mpty>() { return smhldr_ptr->as_shared_ptr<mpty>(); }
|
||||||
|
|
||||||
bool load(handle src, bool /*convert*/) {
|
|
||||||
if (!isinstance<mpty>(src)) return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
struct type_caster<std::shared_ptr<mpty const>> {
|
struct type_caster<std::shared_ptr<mpty const>> : smart_holder_type_caster_load<mpty> {
|
||||||
static constexpr auto name = _<std::shared_ptr<mpty const>>();
|
static constexpr auto name = _<std::shared_ptr<mpty const>>();
|
||||||
|
|
||||||
static handle cast(const std::shared_ptr<mpty const>& /*src*/,
|
static handle cast(const std::shared_ptr<mpty const>& /*src*/,
|
||||||
@ -148,12 +143,7 @@ struct type_caster<std::shared_ptr<mpty const>> {
|
|||||||
|
|
||||||
template <typename> using cast_op_type = std::shared_ptr<mpty const>;
|
template <typename> using cast_op_type = std::shared_ptr<mpty const>;
|
||||||
|
|
||||||
operator std::shared_ptr<mpty const>() { return rtrn_mpty_shcp(); }
|
operator std::shared_ptr<mpty const>() { return smhldr_ptr->as_shared_ptr<mpty>(); }
|
||||||
|
|
||||||
bool load(handle src, bool /*convert*/) {
|
|
||||||
if (!isinstance<mpty>(src)) return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
|
@ -37,8 +37,8 @@ def test_cast_shared_ptr():
|
|||||||
|
|
||||||
|
|
||||||
def test_load_shared_ptr():
|
def test_load_shared_ptr():
|
||||||
assert m.pass_mpty_shmp(m.mpty()) == "load_shmp"
|
assert m.pass_mpty_shmp(m.mpty("Shmp")) == "pass_shmp:Shmp"
|
||||||
assert m.pass_mpty_shcp(m.mpty()) == "load_shcp"
|
assert m.pass_mpty_shcp(m.mpty("Shcp")) == "pass_shcp:Shcp"
|
||||||
|
|
||||||
|
|
||||||
def test_cast_unique_ptr():
|
def test_cast_unique_ptr():
|
||||||
|
Loading…
Reference in New Issue
Block a user