mirror of
https://github.com/pybind/pybind11.git
synced 2025-03-25 18:07:43 +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 whenac9d31e13f
was 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 with1e646c91b4
Apparently 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>
86 lines
2.3 KiB
C++
86 lines
2.3 KiB
C++
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_disowning_mi {
|
|
|
|
// Diamond inheritance (copied from test_multiple_inheritance.cpp).
|
|
struct B {
|
|
int val_b = 10;
|
|
B() = default;
|
|
B(const B &) = default;
|
|
virtual ~B() = default;
|
|
};
|
|
|
|
struct C0 : public virtual B {
|
|
int val_c0 = 20;
|
|
};
|
|
|
|
struct C1 : public virtual B {
|
|
int val_c1 = 21;
|
|
};
|
|
|
|
struct D : public C0, public C1 {
|
|
int val_d = 30;
|
|
};
|
|
|
|
void disown_b(std::unique_ptr<B>) {}
|
|
|
|
// test_multiple_inheritance_python
|
|
struct Base1 {
|
|
explicit Base1(int i) : i(i) {}
|
|
int foo() const { return i; }
|
|
int i;
|
|
};
|
|
|
|
struct Base2 {
|
|
explicit Base2(int j) : j(j) {}
|
|
int bar() const { return j; }
|
|
int j;
|
|
};
|
|
|
|
int disown_base1(std::unique_ptr<Base1> b1) { return b1->i * 2000 + 1; }
|
|
int disown_base2(std::unique_ptr<Base2> b2) { return b2->j * 2000 + 2; }
|
|
|
|
} // namespace class_sh_disowning_mi
|
|
} // namespace pybind11_tests
|
|
|
|
TEST_SUBMODULE(class_sh_disowning_mi, m) {
|
|
using namespace pybind11_tests::class_sh_disowning_mi;
|
|
|
|
py::classh<B>(m, "B")
|
|
.def(py::init<>())
|
|
.def_readonly("val_b", &D::val_b)
|
|
.def("b", [](B *self) { return self; })
|
|
.def("get", [](const B &self) { return self.val_b; });
|
|
|
|
py::classh<C0, B>(m, "C0")
|
|
.def(py::init<>())
|
|
.def_readonly("val_c0", &D::val_c0)
|
|
.def("c0", [](C0 *self) { return self; })
|
|
.def("get", [](const C0 &self) { return self.val_b * 100 + self.val_c0; });
|
|
|
|
py::classh<C1, B>(m, "C1")
|
|
.def(py::init<>())
|
|
.def_readonly("val_c1", &D::val_c1)
|
|
.def("c1", [](C1 *self) { return self; })
|
|
.def("get", [](const C1 &self) { return self.val_b * 100 + self.val_c1; });
|
|
|
|
py::classh<D, C0, C1>(m, "D")
|
|
.def(py::init<>())
|
|
.def_readonly("val_d", &D::val_d)
|
|
.def("d", [](D *self) { return self; })
|
|
.def("get", [](const D &self) {
|
|
return self.val_b * 1000000 + self.val_c0 * 10000 + self.val_c1 * 100 + self.val_d;
|
|
});
|
|
|
|
m.def("disown_b", disown_b);
|
|
|
|
// test_multiple_inheritance_python
|
|
py::classh<Base1>(m, "Base1").def(py::init<int>()).def("foo", &Base1::foo);
|
|
py::classh<Base2>(m, "Base2").def(py::init<int>()).def("bar", &Base2::bar);
|
|
m.def("disown_base1", disown_base1);
|
|
m.def("disown_base2", disown_base2);
|
|
}
|