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

core: rename EigenObjectAllocator into EigenAllocator

parent a805df9a
No related branches found
No related tags found
No related merge requests found
......@@ -91,8 +91,8 @@ namespace eigenpy
NumpyEquivalentType<Scalar>::type_code);
}
// Allocate memory
EigenObjectAllocator<MatType>::copy(mat,pyArray);
// Copy data
EigenAllocator<MatType>::copy(mat,pyArray);
// Create an instance (either np.array or np.matrix)
return NumpyType::getInstance().make(pyArray).ptr();
......@@ -271,7 +271,7 @@ namespace eigenpy
void* storage = reinterpret_cast<bp::converter::rvalue_from_python_storage<MatType>*>
(reinterpret_cast<void*>(memory))->storage.bytes;
EigenObjectAllocator<MatType>::allocate(pyArray,storage);
EigenAllocator<MatType>::allocate(pyArray,storage);
memory->convertible = storage;
}
......
......@@ -92,7 +92,7 @@ namespace eigenpy
details::cast_matrix_or_array<Scalar,NewScalar>::run(mat,MapNumpy<MatType,NewScalar>::map(pyArray))
template<typename MatType>
struct EigenObjectAllocator
struct EigenAllocator
{
typedef MatType Type;
typedef typename MatType::Scalar Scalar;
......@@ -194,7 +194,7 @@ namespace eigenpy
#if EIGEN_VERSION_AT_LEAST(3,2,0)
template<typename MatType>
struct EigenObjectAllocator< eigenpy::Ref<MatType> >
struct EigenAllocator< eigenpy::Ref<MatType> >
{
typedef eigenpy::Ref<MatType> Type;
typedef typename MatType::Scalar Scalar;
......@@ -207,7 +207,7 @@ namespace eigenpy
static void copy(Type const & mat, PyArrayObject * pyArray)
{
EigenObjectAllocator<MatType>::copy(mat,pyArray);
EigenAllocator<MatType>::copy(mat,pyArray);
}
};
#endif
......
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