From 7f92dd3c125382caa9f21be1a6afebe5074a68c8 Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Mon, 8 Jan 2018 19:18:57 +0100
Subject: [PATCH] [All] Set deprecated enableEigenPySpecific with two template
parameters
---
src/details.hpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/details.hpp b/src/details.hpp
index 26681c1..9dc9d2d 100644
--- a/src/details.hpp
+++ b/src/details.hpp
@@ -76,7 +76,7 @@ namespace eigenpy
};
/* --- TO PYTHON -------------------------------------------------------------- */
- template< typename MatType,typename EquivalentEigenType >
+ template<typename MatType>
struct EigenToPy
{
static PyObject* convert(MatType const& mat)
@@ -88,9 +88,9 @@ namespace eigenpy
npy_intp shape[2] = { R,C };
PyArrayObject* pyArray = (PyArrayObject*)
- PyArray_SimpleNew(2, shape, NumpyEquivalentType<T>::type_code);
+ PyArray_SimpleNew(2, shape, NumpyEquivalentType<T>::type_code);
- MapNumpy<EquivalentEigenType>::map(pyArray) = mat;
+ MapNumpy<MatType>::map(pyArray) = mat;
return PyMatrixType::getInstance().make(pyArray).ptr();
}
@@ -136,7 +136,7 @@ namespace eigenpy
};
- template<typename MatType,typename EquivalentEigenType>
+ template<typename MatType>
struct EigenFromPy
{
EigenFromPy()
@@ -197,14 +197,14 @@ namespace eigenpy
using namespace Eigen;
PyArrayObject * pyArray = reinterpret_cast<PyArrayObject*>(pyObj);
- typename MapNumpy<EquivalentEigenType>::EigenMap numpyMap = MapNumpy<EquivalentEigenType>::map(pyArray);
+ typename MapNumpy<MatType>::EigenMap numpyMap = MapNumpy<MatType>::map(pyArray);
void* storage = ((bp::converter::rvalue_from_python_storage<MatType>*)
((void*)memory))->storage.bytes;
assert( (numpyMap.rows()<INT_MAX) && (numpyMap.cols()<INT_MAX)
&& "Map range larger than int ... can never happen." );
int r=(int)numpyMap.rows(),c=(int)numpyMap.cols();
- EquivalentEigenType & eigenMatrix = //* new(storage) MatType(numpyMap.rows(),numpyMap.cols());
+ MatType & eigenMatrix = //* new(storage) MatType(numpyMap.rows(),numpyMap.cols());
TraitsMatrixConstructor<MatType,MatType::RowsAtCompileTime,MatType::ColsAtCompileTime>::construct (storage,r,c);
memory->convertible = storage;
@@ -225,8 +225,8 @@ namespace eigenpy
numpy_import_array();
if(check_registration<MatType>()) return;
- boost::python::to_python_converter<MatType,EigenToPy<MatType,MatType> >();
- EigenFromPy<MatType,MatType>();
+ boost::python::to_python_converter<MatType,EigenToPy<MatType> >();
+ EigenFromPy<MatType>();
}
} // namespace eigenpy
--
GitLab