aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-06-20 13:17:57 +0200
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-06-20 13:17:57 +0200
commit9a6967d9ba662ed2f2916a2f3f3c246a553e98b2 (patch)
treeb23b9b503ca7d9e7c2f620e0a5919dd9386c20d4 /unsupported
parentaeb12b417df7f1db02acd7d99f98a50a61f7b249 (diff)
Attempt to fix MatrixExponential/Function related warnings.
Diffstat (limited to 'unsupported')
-rw-r--r--unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h4
-rw-r--r--unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h b/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
index a4d827746..299809205 100644
--- a/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
+++ b/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
@@ -132,7 +132,7 @@ class MatrixExponential {
typedef typename NumTraits<Scalar>::Real RealScalar;
/** \brief Reference to matrix whose exponential is to be computed. */
- const MatrixType& m_M;
+ const typename ei_nested<MatrixType>::type m_M;
/** \brief Even-degree terms in numerator of Pad&eacute; approximant. */
MatrixType m_U;
@@ -313,7 +313,7 @@ template<typename Derived> struct MatrixExponentialReturnValue
template <typename ResultType>
inline void evalTo(ResultType& result) const
{
- const typename ei_eval<Derived>::type srcEvaluated = m_src.eval();
+ const typename Derived::PlainObject srcEvaluated = m_src.eval();
MatrixExponential<typename Derived::PlainObject> me(srcEvaluated);
me.compute(result);
}
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
index 99446758a..17040c5f3 100644
--- a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
+++ b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
@@ -117,7 +117,7 @@ class MatrixFunction<MatrixType, 0>
}
private:
- const MatrixType& m_A; /**< \brief Reference to argument of matrix function. */
+ const typename ei_nested<MatrixType>::type m_A; /**< \brief Reference to argument of matrix function. */
StemFunction *m_f; /**< \brief Stem function for matrix function under consideration */
MatrixFunction& operator=(const MatrixFunction&);
@@ -167,7 +167,7 @@ class MatrixFunction<MatrixType, 1>
void computeOffDiagonal();
DynMatrixType solveTriangularSylvester(const DynMatrixType& A, const DynMatrixType& B, const DynMatrixType& C);
- const MatrixType& m_A; /**< \brief Reference to argument of matrix function. */
+ const typename ei_nested<MatrixType>::type m_A; /**< \brief Reference to argument of matrix function. */
StemFunction *m_f; /**< \brief Stem function for matrix function under consideration */
MatrixType m_T; /**< \brief Triangular part of Schur decomposition */
MatrixType m_U; /**< \brief Unitary part of Schur decomposition */
@@ -520,7 +520,7 @@ template<typename Derived> class MatrixFunctionReturnValue
template <typename ResultType>
inline void evalTo(ResultType& result) const
{
- const typename ei_eval<Derived>::type Aevaluated = m_A.eval();
+ const typename Derived::PlainObject Aevaluated = m_A.eval();
MatrixFunction<typename Derived::PlainObject> mf(Aevaluated, m_f);
mf.compute(result);
}
@@ -529,7 +529,7 @@ template<typename Derived> class MatrixFunctionReturnValue
Index cols() const { return m_A.cols(); }
private:
- const Derived& m_A;
+ const typename ei_nested<Derived>::type m_A;
StemFunction *m_f;
MatrixFunctionReturnValue& operator=(const MatrixFunctionReturnValue&);