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

Enable direct conversions with no typeinfo present

Browse Source
This commit is contained in:
Ivan Smirnov 2016-10-20 16:46:40 +01:00
parent 7bf90e8008
commit 85e16262d6
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/pybind11/cast.h
View File

@ -166,12 +166,14 @@ public:
} }
bool load(handle src, bool convert, PyTypeObject *tobj) { bool load(handle src, bool convert, PyTypeObject *tobj) {
if (!src || !typeinfo) if (!src)
return false; return false;
if (src.is_none()) { if (src.is_none()) {
value = nullptr; value = nullptr;
return true; return true;
} }
if (!typeinfo)
return load_direct(src, convert);
if (typeinfo->simple_type) { /* Case 1: no multiple inheritance etc. involved */ if (typeinfo->simple_type) { /* Case 1: no multiple inheritance etc. involved */
/* Check if we can safely perform a reinterpret-style cast */ /* Check if we can safely perform a reinterpret-style cast */
@ -208,23 +210,16 @@ public:
} }
} }
/* Perform an implicit or a direct conversion */ /* Perform an implicit conversion */
if (convert) { if (convert) {
for (auto &converter : typeinfo->implicit_conversions) { for (auto &converter : typeinfo->implicit_conversions) {
temp = object(converter(src.ptr(), typeinfo->type), false); temp = object(converter(src.ptr(), typeinfo->type), false);
if (load(temp, false)) if (load(temp, false))
return true; return true;
} }
auto& direct = get_internals().direct_conversions;
auto it = direct.find(tindex);
if (it != direct.end()) {
for (auto& converter : it->second) {
if (converter(src.ptr(), value))
return true;
}
}
} }
return false;
return load_direct(src, convert);
} }
PYBIND11_NOINLINE static handle cast(const void *_src, return_value_policy policy, handle parent, PYBIND11_NOINLINE static handle cast(const void *_src, return_value_policy policy, handle parent,
@ -305,6 +300,20 @@ protected:
std::type_index tindex; std::type_index tindex;
void *value = nullptr; void *value = nullptr;
object temp; object temp;
bool load_direct(handle src, bool convert) {
if (convert) {
auto& direct = get_internals().direct_conversions;
auto it = direct.find(tindex);
if (it != direct.end()) {
for (auto& converter : it->second) {
if (converter(src.ptr(), value))
return true;
}
}
}
return false;
}
}; };
/* Determine suitable casting operator */ /* Determine suitable casting operator */