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

core: consider a specific strategy for windows

This solution should be unified when MSVC compiler will behave properly
parent 90484fa5
No related branches found
No related tags found
No related merge requests found
Pipeline #25998 passed with warnings
...@@ -290,10 +290,16 @@ struct eigen_from_py_impl<MatType, Eigen::MatrixBase<MatType> > { ...@@ -290,10 +290,16 @@ struct eigen_from_py_impl<MatType, Eigen::MatrixBase<MatType> > {
static void registration(); static void registration();
}; };
#ifdef EIGENPY_MSVC_COMPILER
template <typename EigenType> template <typename EigenType>
struct EigenFromPy<EigenType, struct EigenFromPy<EigenType,
typename boost::remove_reference<EigenType>::type::Scalar> typename boost::remove_reference<EigenType>::type::Scalar>
: eigen_from_py_impl<EigenType> {}; #else
template <typename EigenType, typename _Scalar>
struct EigenFromPy
#endif
: eigen_from_py_impl<EigenType> {
};
template <typename MatType> template <typename MatType>
void *eigen_from_py_impl<MatType, Eigen::MatrixBase<MatType> >::convertible( void *eigen_from_py_impl<MatType, Eigen::MatrixBase<MatType> >::convertible(
......
...@@ -155,9 +155,14 @@ struct eigen_to_py_impl_tensor { ...@@ -155,9 +155,14 @@ struct eigen_to_py_impl_tensor {
EIGENPY_DOCUMENTATION_END_IGNORE EIGENPY_DOCUMENTATION_END_IGNORE
#ifdef EIGENPY_MSVC_COMPILER
template <typename EigenType> template <typename EigenType>
struct EigenToPy<EigenType, struct EigenToPy<EigenType,
typename boost::remove_reference<EigenType>::type::Scalar> typename boost::remove_reference<EigenType>::type::Scalar>
#else
template <typename EigenType, typename _Scalar>
struct EigenToPy
#endif
: eigen_to_py_impl<EigenType> { : eigen_to_py_impl<EigenType> {
static PyTypeObject const* get_pytype() { return getPyArrayType(); } static PyTypeObject const* get_pytype() { return getPyArrayType(); }
}; };
......
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