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).
76 lines
2.1 KiB
C++
76 lines
2.1 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_virtual_py_cpp_mix {
|
|
|
|
class Base {
|
|
public:
|
|
virtual ~Base() = default;
|
|
virtual int get() const { return 101; }
|
|
|
|
// Some compilers complain about implicitly defined versions of some of the following:
|
|
Base() = default;
|
|
Base(const Base &) = default;
|
|
};
|
|
|
|
class CppDerivedPlain : public Base {
|
|
public:
|
|
int get() const override { return 202; }
|
|
};
|
|
|
|
class CppDerived : public Base {
|
|
public:
|
|
int get() const override { return 212; }
|
|
};
|
|
|
|
int get_from_cpp_plainc_ptr(const Base *b) { return b->get() + 4000; }
|
|
|
|
int get_from_cpp_unique_ptr(std::unique_ptr<Base> b) { return b->get() + 5000; }
|
|
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
|
|
struct BaseVirtualOverrider : Base, py::trampoline_self_life_support {
|
|
using Base::Base;
|
|
|
|
int get() const override { PYBIND11_OVERRIDE(int, Base, get); }
|
|
};
|
|
|
|
struct CppDerivedVirtualOverrider : CppDerived, py::trampoline_self_life_support {
|
|
using CppDerived::CppDerived;
|
|
|
|
int get() const override { PYBIND11_OVERRIDE(int, CppDerived, get); }
|
|
};
|
|
|
|
#endif
|
|
|
|
} // namespace class_sh_virtual_py_cpp_mix
|
|
} // namespace pybind11_tests
|
|
|
|
using namespace pybind11_tests::class_sh_virtual_py_cpp_mix;
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Base)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(CppDerivedPlain)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(CppDerived)
|
|
|
|
TEST_SUBMODULE(class_sh_virtual_py_cpp_mix, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
py::classh<Base, BaseVirtualOverrider>(m, "Base").def(py::init<>()).def("get", &Base::get);
|
|
|
|
py::classh<CppDerivedPlain, Base>(m, "CppDerivedPlain").def(py::init<>());
|
|
|
|
py::classh<CppDerived, Base, CppDerivedVirtualOverrider>(m, "CppDerived").def(py::init<>());
|
|
|
|
m.def("get_from_cpp_plainc_ptr", get_from_cpp_plainc_ptr, py::arg("b"));
|
|
m.def("get_from_cpp_unique_ptr", get_from_cpp_unique_ptr, py::arg("b"));
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|