Skip to content
Snippets Groups Projects
Verified Commit 249618fc authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core: use implicitly_convertible

parent b20044cd
No related branches found
No related tags found
No related merge requests found
......@@ -515,33 +515,6 @@ namespace eigenpy
}
};
template<typename MatType>
struct EigenFromPy< Eigen::MatrixBase<MatType> >
{
typedef EigenFromPy<MatType> EigenFromPyDerived;
typedef Eigen::MatrixBase<MatType> Base;
/// \brief Determine if pyObj can be converted into a MatType object
static void* convertible(PyArrayObject* pyObj)
{
return EigenFromPyDerived::convertible(pyObj);
}
/// \brief Allocate memory and copy pyObj in the new storage
static void construct(PyObject* pyObj,
bp::converter::rvalue_from_python_stage1_data* memory)
{
EigenFromPyDerived::construct(pyObj,memory);
}
static void registration()
{
bp::converter::registry::push_back
(reinterpret_cast<void *(*)(_object *)>(&EigenFromPy::convertible),
&EigenFromPy::construct,bp::type_id<Base>());
}
};
template<typename MatType,typename EigenEquivalentType>
void enableEigenPySpecific()
{
......@@ -557,7 +530,8 @@ namespace eigenpy
// Add also conversion to Eigen::MatrixBase<MatType>
typedef Eigen::MatrixBase<MatType> MatTypeBase;
EigenFromPy<MatTypeBase>::registration();
bp::implicitly_convertible<MatType,MatTypeBase>();
bp::implicitly_convertible<MatTypeBase,MatType>();
}
};
......@@ -585,7 +559,6 @@ namespace eigenpy
bp::to_python_converter<MatType,EigenToPy<MatType> >();
EigenFromPyConverter<MatType>::registration();
}
} // namespace eigenpy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment