From 45c09616a3ddd8737e5367c69d9f624dbc1c0014 Mon Sep 17 00:00:00 2001 From: Justin Carpentier <justin.carpentier@inria.fr> Date: Mon, 20 Feb 2023 19:57:50 +0100 Subject: [PATCH] core: fix c++98 compatibility --- include/eigenpy/eigen-allocator.hpp | 20 ++++++++++---------- include/eigenpy/numpy-map.hpp | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/eigenpy/eigen-allocator.hpp b/include/eigenpy/eigen-allocator.hpp index 1aa0b6a7..a9b8dc28 100644 --- a/include/eigenpy/eigen-allocator.hpp +++ b/include/eigenpy/eigen-allocator.hpp @@ -171,11 +171,11 @@ template <typename MatType> struct eigen_allocator_impl_matrix; template <typename MatType> -struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType>> +struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType> > : eigen_allocator_impl_matrix<MatType> {}; template <typename MatType> -struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType>> +struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType> > : eigen_allocator_impl_matrix<const MatType> {}; template <typename MatType> @@ -308,12 +308,12 @@ template <typename TensorType> struct eigen_allocator_impl_tensor; template <typename TensorType> -struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType>> +struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType> > : eigen_allocator_impl_tensor<TensorType> {}; template <typename TensorType> struct eigen_allocator_impl<const TensorType, - const Eigen::TensorBase<TensorType>> + const Eigen::TensorBase<TensorType> > : eigen_allocator_impl_tensor<const TensorType> {}; template <typename TensorType> @@ -471,7 +471,7 @@ inline bool is_arr_layout_compatible_with_mat_type(PyArrayObject *pyArray) { } template <typename MatType, int Options, typename Stride> -struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride>> { +struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride> > { typedef Eigen::Ref<MatType, Options, Stride> RefType; typedef typename MatType::Scalar Scalar; @@ -532,7 +532,7 @@ struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride>> { template <typename MatType, int Options, typename Stride> struct eigen_allocator_impl_matrix< - const Eigen::Ref<const MatType, Options, Stride>> { + const Eigen::Ref<const MatType, Options, Stride> > { typedef const Eigen::Ref<const MatType, Options, Stride> RefType; typedef typename MatType::Scalar Scalar; @@ -599,14 +599,14 @@ template <typename TensorType, typename TensorRef> struct eigen_allocator_impl_tensor_ref; template <typename TensorType> -struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType>> +struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType> > : eigen_allocator_impl_tensor_ref<TensorType, - Eigen::TensorRef<TensorType>> {}; + Eigen::TensorRef<TensorType> > {}; template <typename TensorType> -struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType>> +struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType> > : eigen_allocator_impl_tensor_ref< - const TensorType, const Eigen::TensorRef<const TensorType>> {}; + const TensorType, const Eigen::TensorRef<const TensorType> > {}; template <typename TensorType, typename RefType> struct eigen_allocator_impl_tensor_ref { diff --git a/include/eigenpy/numpy-map.hpp b/include/eigenpy/numpy-map.hpp index f085a037..798cfd77 100644 --- a/include/eigenpy/numpy-map.hpp +++ b/include/eigenpy/numpy-map.hpp @@ -24,13 +24,13 @@ struct numpy_map_impl; template <typename MatType, typename InputScalar, int AlignmentValue, typename Stride> struct numpy_map_impl<MatType, InputScalar, AlignmentValue, Stride, - Eigen::MatrixBase<MatType>> + Eigen::MatrixBase<MatType> > : numpy_map_impl_matrix<MatType, InputScalar, AlignmentValue, Stride> {}; template <typename MatType, typename InputScalar, int AlignmentValue, typename Stride> struct numpy_map_impl<const MatType, InputScalar, AlignmentValue, Stride, - const Eigen::MatrixBase<MatType>> + const Eigen::MatrixBase<MatType> > : numpy_map_impl_matrix<const MatType, InputScalar, AlignmentValue, Stride> {}; @@ -183,13 +183,13 @@ struct numpy_map_impl_tensor; template <typename TensorType, typename InputScalar, int AlignmentValue, typename Stride> struct numpy_map_impl<TensorType, InputScalar, AlignmentValue, Stride, - Eigen::TensorBase<TensorType>> + Eigen::TensorBase<TensorType> > : numpy_map_impl_tensor<TensorType, InputScalar, AlignmentValue, Stride> {}; template <typename TensorType, typename InputScalar, int AlignmentValue, typename Stride> struct numpy_map_impl<const TensorType, InputScalar, AlignmentValue, Stride, - const Eigen::TensorBase<TensorType>> + const Eigen::TensorBase<TensorType> > : numpy_map_impl_tensor<const TensorType, InputScalar, AlignmentValue, Stride> {}; -- GitLab