mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
* Pure `git merge --squash smart_holder` (no manual interventions). * Remove ubench/ directory. * Remove include/pybind11/smart_holder.h * [ci skip] smart_ptrs.rst updates [WIP/unfinished] * [ci skip] smart_ptrs.rst updates continued; also updating classes.rst, advanced/classes.rst * Remove README_smart_holder.rst * Restore original README.rst from master * [ci skip] Minimal change to README.rst, to leave a hint that this is pybind11v3 * [ci skip] Work in ChatGPT suggestions. * Change macro name to PYBIND11_RUN_TESTING_WITH_SMART_HOLDER_AS_DEFAULT_BUT_NEVER_USE_IN_PRODUCTION_PLEASE * Add a note pointing to the holder reinterpret_cast. * Incorporate suggestion by @virtuald: https://github.com/pybind/pybind11/pull/5542#discussion_r1967000989 * Systematically change most py::class_ to py::classh under docs/ * Remove references to README_smart_holder.rst This should have been part of commiteb550d03d3. * [ci skip] Fix minor oversight (``class_`` -> ``py::class_``) noticed by chance. * [ci skip] Resolve suggestion by @virtuald https://github.com/pybind/pybind11/pull/5542#discussion_r1969940605 * [ci skip] Apply suggestions by @timohl (thanks!) * https://github.com/pybind/pybind11/pull/5542#discussion_r1970714551 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971315329 * https://github.com/pybind/pybind11/pull/5542#discussion_r1971322821 * Replace `classh : class_` inhertance with `using`, as suggested by @henryiii https://github.com/pybind/pybind11/pull/5542#issuecomment-2689034104 * Revert "Systematically change most py::class_ to py::classh under docs/" This reverts commitac9d31e13f. * docs: focus on py::smart_holder instead of py::classh Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * Restore minor general fixes that got lost whenac9d31e13fwas reverted. * Remove `- smart_holder` from list of branches in all .github/workflows * Extend classh note to explain whitespace noise motivation. * Suggest `py::smart_holder` for "most situations for safety" * Add back PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT This define was * introduced with https://github.com/pybind/pybind11/pull/5286 * removed with https://github.com/pybind/pybind11/pull/5531 It is has been in use here: *f02a2b7653/pybind11_protobuf/native_proto_caster.h (L89-L101)Currently pybind11 unit tests for the two holder caster backwards compatibility traits * `copyable_holder_caster_shared_ptr_with_smart_holder_support_enabled` * `move_only_holder_caster_unique_ptr_with_smart_holder_support_enabled` are missing. * Add py::trampoline_self_life_support to all trampoline examples under docs/. Address suggestion by @timohl: * https://github.com/pybind/pybind11/pull/5542#issuecomment-2686452062 Add to the "please think twice" note: the overhead for safety is likely in the noise. Also fix a two-fold inconsistency introduced by revert-commit1e646c91b4: 1. py::trampoline_self_life_support is mentioned in a note, but is missing in the example right before. 2. The section starting with To enable safely passing a ``std::unique_ptr`` to a trampoline object between is obsolete. * Fix whitespace accident (indentation) introduced with1e646c91b4Apparently the mis-indentation was introduced when resolving merge conflicts for what became1e646c91b4* WHITESPACE CHANGES ONLY in README.rst (list of people that made significant contributions) * Add Ethan Steinberg to list of people that made significant contributions (for completeness, unrelated to smart_holder work). * [ci skip] Add to list of people that made significant contributions: major and/or influential contributors to smart_holder branch * #2904 by @rhaschke was merged on Mar 16, 2021 * #3012 by @rhaschke was merged on May 28, 2021 * #3039 by @jakobandersen was merged on Jun 29, 2021 * #3048 by @Skylion007 was merged on Jun 18, 2021 * #3588 by @virtuald was merged on Jan 3, 2022 * #3633 by @wangxf123456 was merged on Jan 25, 2022 * #3635 by @virtuald was merged on Jan 26, 2022 * #3645 by @wangxf123456 was merged on Jan 25, 2022 * #3796 by @wangxf123456 was merged on Mar 10, 2022 * #3807 by @wangxf123456 was merged on Mar 18, 2022 * #3838 by @wangxf123456 was merged on Apr 15, 2022 * #3929 by @tomba was merged on May 7, 2022 * #4031 by @wangxf123456 was merged on Jun 27, 2022 * #4343 by @wangxf123456 was merged on Nov 18, 2022 * #4381 by @wangxf123456 was merged on Dec 5, 2022 * #4539 by @wangxf123456 was merged on Feb 28, 2023 * #4609 by @wangxf123456 was merged on Apr 6, 2023 * #4775 by @wangxf123456 was merged on Aug 3, 2023 * #4921 by @iwanders was merged on Nov 7, 2023 * #4924 by @iwanders was merged on Nov 6, 2023 * #5401 by @msimacek was merged on Oct 8, 2024 Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: Aaron Gokaslan <aaronGokaslan@gmail.com> Co-authored-by: Dustin Spicuzza <dustin@virtualroadside.com> Co-authored-by: Ivor Wanders <iwanders@users.noreply.github.com> Co-authored-by: Jakob Lykke Andersen <Jakob@caput.dk> Co-authored-by: Michael Šimáček <michael.simacek@oracle.com> Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com> Co-authored-by: Tomi Valkeinen <tomi.valkeinen@iki.fi> Co-authored-by: Xiaofei Wang <6218006+wangxf123456@users.noreply.github.com>
165 lines
6.3 KiB
C++
165 lines
6.3 KiB
C++
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_factory_constructors {
|
|
|
|
template <int> // Using int as a trick to easily generate a series of types.
|
|
struct atyp { // Short for "any type".
|
|
std::string mtxt;
|
|
};
|
|
|
|
template <typename T>
|
|
std::string get_mtxt(const T &obj) {
|
|
return obj.mtxt;
|
|
}
|
|
|
|
using atyp_valu = atyp<0x0>;
|
|
using atyp_rref = atyp<0x1>;
|
|
using atyp_cref = atyp<0x2>;
|
|
using atyp_mref = atyp<0x3>;
|
|
using atyp_cptr = atyp<0x4>;
|
|
using atyp_mptr = atyp<0x5>;
|
|
using atyp_shmp = atyp<0x6>;
|
|
using atyp_shcp = atyp<0x7>;
|
|
using atyp_uqmp = atyp<0x8>;
|
|
using atyp_uqcp = atyp<0x9>;
|
|
using atyp_udmp = atyp<0xA>;
|
|
using atyp_udcp = atyp<0xB>;
|
|
|
|
// clang-format off
|
|
|
|
atyp_valu rtrn_valu() { atyp_valu obj{"Valu"}; return obj; }
|
|
atyp_rref&& rtrn_rref() { static atyp_rref obj; obj.mtxt = "Rref"; return std::move(obj); }
|
|
atyp_cref const& rtrn_cref() { static atyp_cref obj; obj.mtxt = "Cref"; return obj; }
|
|
atyp_mref& rtrn_mref() { static atyp_mref obj; obj.mtxt = "Mref"; return obj; }
|
|
atyp_cptr const* rtrn_cptr() { return new atyp_cptr{"Cptr"}; }
|
|
atyp_mptr* rtrn_mptr() { return new atyp_mptr{"Mptr"}; }
|
|
|
|
std::shared_ptr<atyp_shmp> rtrn_shmp() { return std::make_shared<atyp_shmp>(atyp_shmp{"Shmp"}); }
|
|
std::shared_ptr<atyp_shcp const> rtrn_shcp() { return std::shared_ptr<atyp_shcp const>(new atyp_shcp{"Shcp"}); }
|
|
|
|
std::unique_ptr<atyp_uqmp> rtrn_uqmp() { return std::unique_ptr<atyp_uqmp >(new atyp_uqmp{"Uqmp"}); }
|
|
std::unique_ptr<atyp_uqcp const> rtrn_uqcp() { return std::unique_ptr<atyp_uqcp const>(new atyp_uqcp{"Uqcp"}); }
|
|
|
|
struct sddm : std::default_delete<atyp_udmp > {};
|
|
struct sddc : std::default_delete<atyp_udcp const> {};
|
|
|
|
std::unique_ptr<atyp_udmp, sddm> rtrn_udmp() { return std::unique_ptr<atyp_udmp, sddm>(new atyp_udmp{"Udmp"}); }
|
|
std::unique_ptr<atyp_udcp const, sddc> rtrn_udcp() { return std::unique_ptr<atyp_udcp const, sddc>(new atyp_udcp{"Udcp"}); }
|
|
|
|
// clang-format on
|
|
|
|
// Minimalistic approach to achieve full coverage of construct() overloads for constructing
|
|
// smart_holder from unique_ptr and shared_ptr returns.
|
|
struct with_alias {
|
|
int val = 0;
|
|
virtual ~with_alias() = default;
|
|
// Some compilers complain about implicitly defined versions of some of the following:
|
|
with_alias() = default;
|
|
with_alias(const with_alias &) = default;
|
|
with_alias(with_alias &&) = default;
|
|
with_alias &operator=(const with_alias &) = default;
|
|
with_alias &operator=(with_alias &&) = default;
|
|
};
|
|
struct with_alias_alias : with_alias {};
|
|
struct sddwaa : std::default_delete<with_alias_alias> {};
|
|
|
|
} // namespace class_sh_factory_constructors
|
|
} // namespace pybind11_tests
|
|
|
|
TEST_SUBMODULE(class_sh_factory_constructors, m) {
|
|
using namespace pybind11_tests::class_sh_factory_constructors;
|
|
|
|
py::classh<atyp_valu>(m, "atyp_valu")
|
|
.def(py::init(&rtrn_valu))
|
|
.def("get_mtxt", get_mtxt<atyp_valu>);
|
|
|
|
py::classh<atyp_rref>(m, "atyp_rref")
|
|
.def(py::init(&rtrn_rref))
|
|
.def("get_mtxt", get_mtxt<atyp_rref>);
|
|
|
|
py::classh<atyp_cref>(m, "atyp_cref")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_cref))
|
|
.def("get_mtxt", get_mtxt<atyp_cref>);
|
|
|
|
py::classh<atyp_mref>(m, "atyp_mref")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_mref))
|
|
.def("get_mtxt", get_mtxt<atyp_mref>);
|
|
|
|
py::classh<atyp_cptr>(m, "atyp_cptr")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... must return a compatible ...
|
|
// .def(py::init(&rtrn_cptr))
|
|
.def("get_mtxt", get_mtxt<atyp_cptr>);
|
|
|
|
py::classh<atyp_mptr>(m, "atyp_mptr")
|
|
.def(py::init(&rtrn_mptr))
|
|
.def("get_mtxt", get_mtxt<atyp_mptr>);
|
|
|
|
py::classh<atyp_shmp>(m, "atyp_shmp")
|
|
.def(py::init(&rtrn_shmp))
|
|
.def("get_mtxt", get_mtxt<atyp_shmp>);
|
|
|
|
py::classh<atyp_shcp>(m, "atyp_shcp")
|
|
// py::class_<atyp_shcp, std::shared_ptr<atyp_shcp>>(m, "atyp_shcp")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_shcp))
|
|
.def("get_mtxt", get_mtxt<atyp_shcp>);
|
|
|
|
py::classh<atyp_uqmp>(m, "atyp_uqmp")
|
|
.def(py::init(&rtrn_uqmp))
|
|
.def("get_mtxt", get_mtxt<atyp_uqmp>);
|
|
|
|
py::classh<atyp_uqcp>(m, "atyp_uqcp")
|
|
// class_: ... cannot pass object of non-trivial type ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_uqcp))
|
|
.def("get_mtxt", get_mtxt<atyp_uqcp>);
|
|
|
|
py::classh<atyp_udmp>(m, "atyp_udmp")
|
|
.def(py::init(&rtrn_udmp))
|
|
.def("get_mtxt", get_mtxt<atyp_udmp>);
|
|
|
|
py::classh<atyp_udcp>(m, "atyp_udcp")
|
|
// py::class_<atyp_udcp, std::unique_ptr<atyp_udcp, sddc>>(m, "atyp_udcp")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_udcp))
|
|
.def("get_mtxt", get_mtxt<atyp_udcp>);
|
|
|
|
py::classh<with_alias, with_alias_alias>(m, "with_alias")
|
|
.def_readonly("val", &with_alias::val)
|
|
.def(py::init([](int i) {
|
|
auto p = std::unique_ptr<with_alias_alias, sddwaa>(new with_alias_alias);
|
|
p->val = i * 100;
|
|
return p;
|
|
}))
|
|
.def(py::init([](int i, int j) {
|
|
auto p = std::unique_ptr<with_alias_alias>(new with_alias_alias);
|
|
p->val = i * 100 + j * 10;
|
|
return p;
|
|
}))
|
|
.def(py::init([](int i, int j, int k) {
|
|
auto p = std::make_shared<with_alias_alias>();
|
|
p->val = i * 100 + j * 10 + k;
|
|
return p;
|
|
}))
|
|
.def(py::init(
|
|
[](int, int, int, int) { return std::unique_ptr<with_alias>(new with_alias); },
|
|
[](int, int, int, int) {
|
|
return std::unique_ptr<with_alias>(new with_alias); // Invalid alias factory.
|
|
}))
|
|
.def(py::init([](int, int, int, int, int) { return std::make_shared<with_alias>(); },
|
|
[](int, int, int, int, int) {
|
|
return std::make_shared<with_alias>(); // Invalid alias factory.
|
|
}));
|
|
}
|