diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-02-18 11:24:32 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-18 11:24:32 +0100 |
| commit | d4eda014889541e3a22680bf236bf814a6fbc813 (patch) | |
| tree | a7b013b42b6a5df7d90dc3648f2ed52eb7fed4d7 /Eigen | |
| parent | 24d65ac0b0121ad70984ce1871cf2a8116b42201 (diff) | |
Big 957, workaround MSVC/ICC compilation issue
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/SparseCore/SparseBlock.h | 6 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseMatrixBase.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index 40dc1a2bd..acd82e926 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -292,7 +292,8 @@ const typename SparseMatrixBase<Derived>::ConstInnerVectorReturnType SparseMatri * is col-major (resp. row-major).
*/
template<typename Derived>
-Block<Derived,Dynamic,Dynamic,true> SparseMatrixBase<Derived>::innerVectors(Index outerStart, Index outerSize)
+typename SparseMatrixBase<Derived>::InnerVectorsReturnType
+SparseMatrixBase<Derived>::innerVectors(Index outerStart, Index outerSize)
{
return Block<Derived,Dynamic,Dynamic,true>(derived(),
IsRowMajor ? outerStart : 0, IsRowMajor ? 0 : outerStart,
@@ -304,7 +305,8 @@ Block<Derived,Dynamic,Dynamic,true> SparseMatrixBase<Derived>::innerVectors(Inde * is col-major (resp. row-major). Read-only.
*/
template<typename Derived>
-const Block<const Derived,Dynamic,Dynamic,true> SparseMatrixBase<Derived>::innerVectors(Index outerStart, Index outerSize) const
+const typename SparseMatrixBase<Derived>::ConstInnerVectorsReturnType
+SparseMatrixBase<Derived>::innerVectors(Index outerStart, Index outerSize) const
{
return Block<const Derived,Dynamic,Dynamic,true>(derived(),
IsRowMajor ? outerStart : 0, IsRowMajor ? 0 : outerStart,
diff --git a/Eigen/src/SparseCore/SparseMatrixBase.h b/Eigen/src/SparseCore/SparseMatrixBase.h index 9039ebcec..d76dfa33d 100644 --- a/Eigen/src/SparseCore/SparseMatrixBase.h +++ b/Eigen/src/SparseCore/SparseMatrixBase.h @@ -321,8 +321,10 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived> const ConstInnerVectorReturnType innerVector(Index outer) const; // set of inner-vectors - Block<Derived,Dynamic,Dynamic,true> innerVectors(Index outerStart, Index outerSize); - const Block<const Derived,Dynamic,Dynamic,true> innerVectors(Index outerStart, Index outerSize) const; + typedef Block<Derived,Dynamic,Dynamic,true> InnerVectorsReturnType; + typedef Block<const Derived,Dynamic,Dynamic,true> ConstInnerVectorsReturnType; + InnerVectorsReturnType innerVectors(Index outerStart, Index outerSize); + const ConstInnerVectorsReturnType innerVectors(Index outerStart, Index outerSize) const; DenseMatrixType toDense() const { |