diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-07-17 13:21:35 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-07-17 13:21:35 +0200 |
| commit | 2f593ee67cd2ce995fcf52560daf88774c7c64f2 (patch) | |
| tree | 973b12ded629a9778d2cb05961edba799d8e908e /Eigen/src/Core/MatrixBase.h | |
| parent | 231d4a6fdae342af5f2a482104539eafe4fc5cdb (diff) | |
| parent | 20e535e1429cdb2f2dace3e2e6915e33968aa198 (diff) | |
merge with main branch
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 8dbe71b93..eed10de2d 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -232,8 +232,8 @@ template<typename Derived> class MatrixBase typedef Diagonal<Derived> DiagonalReturnType; DiagonalReturnType diagonal(); - typedef const Diagonal<const Derived> ConstDiagonalReturnType; - const ConstDiagonalReturnType diagonal() const; + typedef typename internal::add_const<Diagonal<const Derived> >::type ConstDiagonalReturnType; + ConstDiagonalReturnType diagonal() const; template<int Index> struct DiagonalIndexReturnType { typedef Diagonal<Derived,Index> Type; }; template<int Index> struct ConstDiagonalIndexReturnType { typedef const Diagonal<const Derived,Index> Type; }; |