Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-14 09:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renaming all "classh" to "smart_holder" in pybind11/detail/smart_holder_type_casters.h.

Browse Source 
The user-facing macro is now PYBIND11_SMART_HOLDER_TYPE_CASTERS.
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-01-24 22:35:18 -08:00
parent e96c06e61a
commit bda4178163
7 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/pybind11/detail/smart_holder_type_casters.h
View File

@ -60,7 +60,7 @@ public:
" Python instance is uninitialized or was disowned."); " Python instance is uninitialized or was disowned.");
} }
if (v_h.value_ptr() == nullptr) { if (v_h.value_ptr() == nullptr) {
pybind11_fail("classh_type_casters: Unexpected v_h.value_ptr() nullptr."); pybind11_fail("smart_holder_type_casters: Unexpected v_h.value_ptr() nullptr.");
} }
loaded_v_h.type = typeinfo; loaded_v_h.type = typeinfo;
} }
@ -70,7 +70,7 @@ public:
modified_type_caster_generic_load_impl sub_caster(*cast.first); modified_type_caster_generic_load_impl sub_caster(*cast.first);
if (sub_caster.load(src, convert)) { if (sub_caster.load(src, convert)) {
if (loaded_v_h_cpptype != nullptr) { if (loaded_v_h_cpptype != nullptr) {
pybind11_fail("classh_type_casters: try_implicit_casts failure."); pybind11_fail("smart_holder_type_casters: try_implicit_casts failure.");
} }
loaded_v_h = sub_caster.loaded_v_h; loaded_v_h = sub_caster.loaded_v_h;
loaded_v_h_cpptype = cast.first; loaded_v_h_cpptype = cast.first;
@ -124,11 +124,11 @@ public:
// Magic number intentionally hard-coded for simplicity and maximum robustness. // Magic number intentionally hard-coded for simplicity and maximum robustness.
if (foreign_loader->local_load_safety_guard != 37726257887406645) { if (foreign_loader->local_load_safety_guard != 37726257887406645) {
pybind11_fail( pybind11_fail(
"Unexpected local_load_safety_guard," "smart_holder_type_casters: Unexpected local_load_safety_guard,"
" possibly due to py::class_ vs py::classh mixup."); " possibly due to py::class_ holder mixup.");
} }
if (loaded_v_h_cpptype != nullptr) { if (loaded_v_h_cpptype != nullptr) {
pybind11_fail("classh_type_casters: try_load_foreign_module_local failure."); pybind11_fail("smart_holder_type_casters: try_load_foreign_module_local failure.");
} }
loaded_v_h = foreign_loader->loaded_v_h; loaded_v_h = foreign_loader->loaded_v_h;
loaded_v_h_cpptype = foreign_loader->loaded_v_h_cpptype; loaded_v_h_cpptype = foreign_loader->loaded_v_h_cpptype;
@ -232,7 +232,7 @@ public:
void *(*implicit_cast)(void *) = nullptr; void *(*implicit_cast)(void *) = nullptr;
value_and_holder loaded_v_h; value_and_holder loaded_v_h;
bool reinterpret_cast_deemed_ok = false; bool reinterpret_cast_deemed_ok = false;
// Magic number intentionally hard-coded, to guard against class_ vs classh mixups. // Magic number intentionally hard-coded, to guard against class_ holder mixups.
// Ideally type_caster_generic would have a similar guard, but this requires a change there. // Ideally type_caster_generic would have a similar guard, but this requires a change there.
std::size_t local_load_safety_guard = 37726257887406645; std::size_t local_load_safety_guard = 37726257887406645;
}; };
@ -336,7 +336,7 @@ struct make_constructor {
// type_caster_base END // type_caster_base END
template <typename T> template <typename T>
struct classh_type_caster : smart_holder_type_caster_load<T> { struct smart_holder_type_caster : smart_holder_type_caster_load<T> {
static constexpr auto name = _<T>(); static constexpr auto name = _<T>();
// static handle cast(T, ...) // static handle cast(T, ...)
@ -494,7 +494,7 @@ struct classh_type_caster : smart_holder_type_caster_load<T> {
}; };
template <typename T> template <typename T>
struct classh_type_caster<std::shared_ptr<T>> : smart_holder_type_caster_load<T> { struct smart_holder_type_caster<std::shared_ptr<T>> : smart_holder_type_caster_load<T> {
static constexpr auto name = _<std::shared_ptr<T>>(); static constexpr auto name = _<std::shared_ptr<T>>();
static handle cast(const std::shared_ptr<T> &src, return_value_policy policy, handle parent) { static handle cast(const std::shared_ptr<T> &src, return_value_policy policy, handle parent) {
@ -539,7 +539,7 @@ struct classh_type_caster<std::shared_ptr<T>> : smart_holder_type_caster_load<T>
}; };
template <typename T> template <typename T>
struct classh_type_caster<std::shared_ptr<T const>> : smart_holder_type_caster_load<T> { struct smart_holder_type_caster<std::shared_ptr<T const>> : smart_holder_type_caster_load<T> {
static constexpr auto name = _<std::shared_ptr<T const>>(); static constexpr auto name = _<std::shared_ptr<T const>>();
static handle static handle
@ -557,7 +557,7 @@ struct classh_type_caster<std::shared_ptr<T const>> : smart_holder_type_caster_l
}; };
template <typename T> template <typename T>
struct classh_type_caster<std::unique_ptr<T>> : smart_holder_type_caster_load<T> { struct smart_holder_type_caster<std::unique_ptr<T>> : smart_holder_type_caster_load<T> {
static constexpr auto name = _<std::unique_ptr<T>>(); static constexpr auto name = _<std::unique_ptr<T>>();
static handle cast(std::unique_ptr<T> &&src, return_value_policy policy, handle parent) { static handle cast(std::unique_ptr<T> &&src, return_value_policy policy, handle parent) {
@ -600,7 +600,7 @@ struct classh_type_caster<std::unique_ptr<T>> : smart_holder_type_caster_load<T>
}; };
template <typename T> template <typename T>
struct classh_type_caster<std::unique_ptr<T const>> : smart_holder_type_caster_load<T> { struct smart_holder_type_caster<std::unique_ptr<T const>> : smart_holder_type_caster_load<T> {
static constexpr auto name = _<std::unique_ptr<T const>>(); static constexpr auto name = _<std::unique_ptr<T const>>();
static handle cast(std::unique_ptr<T const> &&src, return_value_policy policy, handle parent) { static handle cast(std::unique_ptr<T const> &&src, return_value_policy policy, handle parent) {
@ -616,21 +616,23 @@ struct classh_type_caster<std::unique_ptr<T const>> : smart_holder_type_caster_l
operator std::unique_ptr<T const>() { return this->loaded_as_unique_ptr(); } operator std::unique_ptr<T const>() { return this->loaded_as_unique_ptr(); }
}; };
#define PYBIND11_CLASSH_TYPE_CASTERS(T) \ #define PYBIND11_SMART_HOLDER_TYPE_CASTERS(T) \
namespace pybind11 { \ namespace pybind11 { \
namespace detail { \ namespace detail { \
template <> \ template <> \
class type_caster<T> : public classh_type_caster<T> {}; \ class type_caster<T> : public smart_holder_type_caster<T> {}; \
template <> \ template <> \
class type_caster<std::shared_ptr<T>> : public classh_type_caster<std::shared_ptr<T>> {}; \ class type_caster<std::shared_ptr<T>> : public smart_holder_type_caster<std::shared_ptr<T>> { \
}; \
template <> \ template <> \
class type_caster<std::shared_ptr<T const>> \ class type_caster<std::shared_ptr<T const>> \
: public classh_type_caster<std::shared_ptr<T const>> {}; \ : public smart_holder_type_caster<std::shared_ptr<T const>> {}; \
template <> \ template <> \
class type_caster<std::unique_ptr<T>> : public classh_type_caster<std::unique_ptr<T>> {}; \ class type_caster<std::unique_ptr<T>> : public smart_holder_type_caster<std::unique_ptr<T>> { \
}; \
template <> \ template <> \
class type_caster<std::unique_ptr<T const>> \ class type_caster<std::unique_ptr<T const>> \
: public classh_type_caster<std::unique_ptr<T const>> {}; \ : public smart_holder_type_caster<std::unique_ptr<T const>> {}; \
} \ } \
} }

2
tests/classh_module_local_0.cpp
View File

@ -17,7 +17,7 @@ atyp rtrn_valu_atyp() { return atyp(); }
} // namespace classh_module_local } // namespace classh_module_local
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp)
PYBIND11_MODULE(classh_module_local_0, m) { PYBIND11_MODULE(classh_module_local_0, m) {
using namespace pybind11_tests::classh_module_local; using namespace pybind11_tests::classh_module_local;

2
tests/classh_module_local_1.cpp
View File

@ -16,7 +16,7 @@ std::string get_mtxt(const atyp &obj) { return obj.mtxt; }
} // namespace classh_module_local } // namespace classh_module_local
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp)
PYBIND11_MODULE(classh_module_local_1, m) { PYBIND11_MODULE(classh_module_local_1, m) {
namespace py = pybind11; namespace py = pybind11;

2
tests/classh_module_local_2.cpp
View File

@ -16,7 +16,7 @@ std::string get_mtxt(const atyp &obj) { return obj.mtxt; }
} // namespace classh_module_local } // namespace classh_module_local
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_module_local::atyp)
PYBIND11_MODULE(classh_module_local_2, m) { PYBIND11_MODULE(classh_module_local_2, m) {
namespace py = pybind11; namespace py = pybind11;

10
tests/test_classh_inheritance.cpp
View File

@ -56,12 +56,12 @@ inline int pass_cptr_drvd2(drvd2 const *d) { return d->id() + 23; }
} // namespace classh_inheritance } // namespace classh_inheritance
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_inheritance::base) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_inheritance::base)
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_inheritance::drvd) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_inheritance::drvd)
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_inheritance::base1) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_inheritance::base1)
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_inheritance::base2) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_inheritance::base2)
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_inheritance::drvd2) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_inheritance::drvd2)
namespace pybind11_tests { namespace pybind11_tests {
namespace classh_inheritance { namespace classh_inheritance {

2
tests/test_classh_wip.cpp
View File

@ -49,7 +49,7 @@ std::unique_ptr<atyp> unique_ptr_roundtrip(std::unique_ptr<atyp> obj) { return o
} // namespace classh_wip } // namespace classh_wip
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::classh_wip::atyp) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::classh_wip::atyp)
namespace pybind11_tests { namespace pybind11_tests {
namespace classh_wip { namespace classh_wip {

2
tests/test_unique_ptr_member.cpp
View File

@ -40,7 +40,7 @@ private:
} // namespace unique_ptr_member } // namespace unique_ptr_member
} // namespace pybind11_tests } // namespace pybind11_tests
PYBIND11_CLASSH_TYPE_CASTERS(pybind11_tests::unique_ptr_member::pointee) PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::unique_ptr_member::pointee)
namespace pybind11_tests { namespace pybind11_tests {
namespace unique_ptr_member { namespace unique_ptr_member {