aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-01-20 11:32:13 +0100
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-01-20 11:32:13 +0100
commit89ee9f092f1a1626dc1cbfb8acd31a6706beddcb (patch)
tree8c5b5b339f754ac6ad660f4318853313ae530a0f /unsupported
parentd5d5417062f6b49e5d0fed0fe2311e1d3e8e227f (diff)
Fixed compilation of MatrixFunctions module.
Diffstat (limited to 'unsupported')
-rw-r--r--unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
index 49326cd0e..fbc55507f 100644
--- a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
+++ b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
@@ -198,7 +198,7 @@ class MatrixFunction<MatrixType, 1>
void permuteSchur();
void swapEntriesInSchur(int index);
void computeBlockAtomic();
- Block<MatrixType> block(const MatrixType& A, int i, int j);
+ typename BlockReturnType<MatrixType>::Type block(const MatrixType& A, int i, int j);
void computeOffDiagonal();
DynMatrixType solveTriangularSylvester(const DynMatrixType& A, const DynMatrixType& B, const DynMatrixType& C);
@@ -311,7 +311,7 @@ void MatrixFunction<MatrixType,1>::computeClusterSize()
{
const int rows = m_T.rows();
VectorType diag = m_T.diagonal();
- const int numClusters = m_clusters.size();
+ const int numClusters = static_cast<int>(m_clusters.size());
m_clusterSize.setZero(numClusters);
m_eivalToCluster.resize(rows);
@@ -400,7 +400,7 @@ void MatrixFunction<MatrixType,1>::computeBlockAtomic()
/** \brief Return block of matrix according to blocking given by #m_blockStart */
template <typename MatrixType>
-Block<MatrixType> MatrixFunction<MatrixType,1>::block(const MatrixType& A, int i, int j)
+typename BlockReturnType<MatrixType>::Type MatrixFunction<MatrixType,1>::block(const MatrixType& A, int i, int j)
{
return A.block(m_blockStart(i), m_blockStart(j), m_clusterSize(i), m_clusterSize(j));
}