Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 22:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't throw an exception when python deallocates an object which still exists on the C++ side

Browse Source
This commit is contained in:
Wenzel Jakob 2015-10-01 18:37:26 +02:00
parent 6d6fd099db
commit ac0fde988a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pybind/cast.h
View File

@ -292,6 +292,9 @@ public:
PYBIND_TYPE_CASTER(void_type, "None"); PYBIND_TYPE_CASTER(void_type, "None");
}; };
template <> class type_caster<void> : public type_caster<void_type> {
};
template <> class type_caster<bool> { template <> class type_caster<bool> {
public: public:
bool load(PyObject *src, bool) { bool load(PyObject *src, bool) {

2
include/pybind/pybind.h
View File

@ -883,6 +883,8 @@ public:
inline function get_overload(const void *this_ptr, const char *name) { inline function get_overload(const void *this_ptr, const char *name) {
handle py_object = detail::get_object_handle(this_ptr); handle py_object = detail::get_object_handle(this_ptr);
if (!py_object)
return function();
handle type = py_object.get_type(); handle type = py_object.get_type();
auto key = std::make_pair(type.ptr(), name); auto key = std::make_pair(type.ptr(), name);

2
include/pybind/pytypes.h
View File

@ -400,7 +400,7 @@ inline handle get_object_handle(const void *ptr) {
auto instances = get_internals().registered_instances; auto instances = get_internals().registered_instances;
auto it = instances.find(ptr); auto it = instances.find(ptr);
if (it == instances.end()) if (it == instances.end())
throw std::runtime_error("Internal error: could not acquire Python handle of a C++ object"); return handle();
return it->second; return it->second;
} }