GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-15 13:15:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC compilation issue

Browse Source
This commit is contained in:
Gael Guennebaud 2014-12-02 14:35:31 +01:00
parent 1a8dc85142
commit a819fa148d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/Diagonal.h
View File

@ -213,7 +213,7 @@ template<typename Derived>
inline typename MatrixBase<Derived>::DiagonalDynamicIndexReturnType inline typename MatrixBase<Derived>::DiagonalDynamicIndexReturnType
MatrixBase<Derived>::diagonal(Index index) MatrixBase<Derived>::diagonal(Index index)
{ {
return typename DiagonalIndexReturnType<DynamicIndex>::Type(derived(), index); return DiagonalDynamicIndexReturnType(derived(), index);
} }
/** This is the const version of diagonal(Index). */ /** This is the const version of diagonal(Index). */
@ -221,7 +221,7 @@ template<typename Derived>
inline typename MatrixBase<Derived>::ConstDiagonalDynamicIndexReturnType inline typename MatrixBase<Derived>::ConstDiagonalDynamicIndexReturnType
MatrixBase<Derived>::diagonal(Index index) const 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 /** \returns an expression of the \a DiagIndex-th sub or super diagonal of the matrix \c *this

2
Eigen/src/Core/MatrixBase.h
View File

@ -246,7 +246,7 @@ template<typename Derived> class MatrixBase
typename ConstDiagonalIndexReturnType<Index>::Type diagonal() const; typename ConstDiagonalIndexReturnType<Index>::Type diagonal() const;
typedef Diagonal<Derived,DynamicIndex> DiagonalDynamicIndexReturnType; 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 EIGEN_DEVICE_FUNC
DiagonalDynamicIndexReturnType diagonal(Index index); DiagonalDynamicIndexReturnType diagonal(Index index);