mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-25 22:52:01 +00:00
48f25275c4
* Put bakein branch @ 18b72c0ffa on top of smart_holder branch:
Commands used:
```
git checkout bakein
git diff smart_holder > ~/zd
git checkout smart_holder
git checkout -b bakein_sh
patch -p 1 < ~/zd
git checkout smart_holder \
MANIFEST.in \
README.rst \
README_smart_holder.rst \
docs/advanced/smart_ptrs.rst \
ubench/holder_comparison.cpp \
ubench/holder_comparison.py \
ubench/holder_comparison_extract_sheet_data.py \
ubench/number_bucket.h \
ubench/python/number_bucket.clif
git add -A
```
* Add back README_smart_holder.rst in tests/extra_python_package/test_files.py
* Restore smart_holder_poc.h as-is on smart_holder branch (i.e. undo `PYBIND11_SMART_HOLDER_PADDING`, which was meant for stress-testing only).
* Insert `std::move()` as suggested by @laramiel
* `property_cpp_function_sh_*` named specializations, as suggested by @laramiel (https://github.com/pybind/pybind11/pull/5257#discussion_r1688346807)
* Call `property_cpp_function_classic` member functions, rather than inlining the implementations.
* Use `PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT` in holder_comparison.cpp (holder_comparison.py is NOT changed accordingly in this commit, i.e. can still only be run if the smart_holder functionality is available).
* Systematically rename `loaded_as` to `load_as` (`shared_ptr`, `unique_ptr`) as suggested by @laramiel
* Make change as suggested by @laramiel. This makes it much more obvious that the latest implementation of `smart_holder_from_unique_ptr()` accepts all existing `return_value_policy` enum values except `copy`.
* Resolve `BAKEIN_WIP: Rewrite comment.` for `property_cpp_function_*` specializations.
* Resolve `BAKEIN_WIP: Add comment to explain: This is meant for stress-testing only.`
* Resolve all remaining BAKEIN_WIP (in pybind11/cast.h).
Leave only two pairs of SMART_HOLDER_BAKEIN_FOLLOW_ON comments: refactoring of copyable_holder_caster, move_only_holder_caster. This is best left until after the smart_holder branch is merged into the master branch.
* Remove obsolete `using holder_type = smart_holder;` in `load_helper`
* Add SMART_HOLDER_BAKEIN_FOLLOW_ON comment for `internals::default_holder`
* README_smart_holder.rst update (line count reduced from 356 to 123).
103 lines
3.0 KiB
C++
103 lines
3.0 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#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
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::B)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::C0)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::C1)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::D)
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::Base1)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_disowning_mi::Base2)
|
|
|
|
TEST_SUBMODULE(class_sh_disowning_mi, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
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);
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|