ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-14 18:08:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_any_to_python_shared_ptr' into 'master'

Browse Source 
Fix AnyToPython for types with shared_ptr holder type

See merge request ngsolve/netgen!594
This commit is contained in:
Hochsteger, Matthias 2023-08-28 15:34:27 +02:00
commit b770c034c4
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/core/register_archive.hpp
View File

@ -2,6 +2,7 @@
#define NETGEN_REGISTER_ARCHIVE_HPP #define NETGEN_REGISTER_ARCHIVE_HPP
#ifdef NETGEN_PYTHON #ifdef NETGEN_PYTHON
#include <memory>
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include <pybind11/cast.h> #include <pybind11/cast.h>
#endif // NETGEN_PYTHON #endif // NETGEN_PYTHON
@ -32,6 +33,15 @@ namespace ngcore {
*this & val; *this & val;
return *this; return *this;
} }
template <typename T>
struct has_shared_from_this
{
template <typename C> static std::true_type check( decltype( sizeof(&C::shared_from_this() )) ) { return std::true_type(); }
template <typename> static std::false_type check(...) { return std::false_type(); }
typedef decltype( check<T>(sizeof(char)) ) type;
static constexpr type value = type();
};
#endif // NETGEN_PYTHON #endif // NETGEN_PYTHON
@ -65,8 +75,13 @@ namespace ngcore {
}; };
#ifdef NETGEN_PYTHON #ifdef NETGEN_PYTHON
info.anyToPyCaster = [](const std::any &a) { info.anyToPyCaster = [](const std::any &a) {
const T* val = std::any_cast<T>(&a); if constexpr(has_shared_from_this<T>::value) {
return pybind11::cast(val); std::shared_ptr<T> val = std::any_cast<std::shared_ptr<T>>(&a);
return pybind11::cast(val);
} else {
const T* val = std::any_cast<T>(&a);
return pybind11::cast(val);
}
}; };
#endif // NETGEN_PYTHON #endif // NETGEN_PYTHON
Archive::SetArchiveRegister(std::string(Demangle(typeid(T).name())),info); Archive::SetArchiveRegister(std::string(Demangle(typeid(T).name())),info);