diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-12-02 14:35:31 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-12-02 14:35:31 +0100 |
| commit | a819fa148d177c25704b07ae1d84968bbd38051c (patch) | |
| tree | bfa4a999b0e879d34b609f842292806a7136dcc6 /Eigen | |
| parent | 1a8dc8514257cb931b1b5bca67004fa2b628133d (diff) | |
Fix MSVC compilation issue
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/Diagonal.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Diagonal.h b/Eigen/src/Core/Diagonal.h index 618b8980b..33b82f90f 100644 --- a/Eigen/src/Core/Diagonal.h +++ b/Eigen/src/Core/Diagonal.h @@ -213,7 +213,7 @@ template<typename Derived> inline typename MatrixBase<Derived>::DiagonalDynamicIndexReturnType MatrixBase<Derived>::diagonal(Index index) { - return typename DiagonalIndexReturnType<DynamicIndex>::Type(derived(), index); + return DiagonalDynamicIndexReturnType(derived(), index); } /** This is the const version of diagonal(Index). */ @@ -221,7 +221,7 @@ template<typename Derived> inline typename MatrixBase<Derived>::ConstDiagonalDynamicIndexReturnType MatrixBase<Derived>::diagonal(Index index) const { - return typename ConstDiagonalIndexReturnType<DynamicIndex>::Type(derived(), index); + return ConstDiagonalDynamicIndexReturnType(derived(), index); } /** \returns an expression of the \a DiagIndex-th sub or super diagonal of the matrix \c *this diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 97a59e692..86994cb36 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -246,7 +246,7 @@ template<typename Derived> class MatrixBase typename ConstDiagonalIndexReturnType<Index>::Type diagonal() const; typedef Diagonal<Derived,DynamicIndex> DiagonalDynamicIndexReturnType; - typedef const Diagonal<const Derived,DynamicIndex> ConstDiagonalDynamicIndexReturnType; + typedef typename internal::add_const<Diagonal<const Derived,DynamicIndex> >::type ConstDiagonalDynamicIndexReturnType; EIGEN_DEVICE_FUNC DiagonalDynamicIndexReturnType diagonal(Index index); |