aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/CwiseUnaryView.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2010-01-04 19:13:08 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2010-01-04 19:13:08 +0100
commit71a171c267df54118cda01d845d42f3d3d465de3 (patch)
tree9432398656cee78e36fde1841cf7453af18dae2f /Eigen/src/Core/CwiseUnaryView.h
parentb6898996d4107b5823fc0fdaa22bfe0811716863 (diff)
s/asMatrix()/matrix()
Diffstat (limited to 'Eigen/src/Core/CwiseUnaryView.h')
-rw-r--r--Eigen/src/Core/CwiseUnaryView.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/CwiseUnaryView.h b/Eigen/src/Core/CwiseUnaryView.h
index b21fa56c6..2ff5d3d45 100644
--- a/Eigen/src/Core/CwiseUnaryView.h
+++ b/Eigen/src/Core/CwiseUnaryView.h
@@ -90,9 +90,9 @@ class CwiseUnaryView : ei_no_assignment_operator,
template<typename ViewOp, typename MatrixType>
class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense> : public MatrixBase<CwiseUnaryView<ViewOp, MatrixType> >
{
- const typename ei_cleantype<typename MatrixType::Nested>::type& matrix() const
+ const typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() const
{ return derived().nestedExpression(); }
- typename ei_cleantype<typename MatrixType::Nested>::type& matrix()
+ typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression()
{ return derived().nestedExpression(); }
public:
@@ -102,22 +102,22 @@ class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense> : public MatrixBase<CwiseUnary
EIGEN_STRONG_INLINE const Scalar coeff(int row, int col) const
{
- return derived()._functor()(matrix().coeff(row, col));
+ return derived()._functor()(nestedExpression().coeff(row, col));
}
EIGEN_STRONG_INLINE const Scalar coeff(int index) const
{
- return derived()._functor()(matrix().coeff(index));
+ return derived()._functor()(nestedExpression().coeff(index));
}
EIGEN_STRONG_INLINE Scalar& coeffRef(int row, int col)
{
- return derived()._functor()(matrix().const_cast_derived().coeffRef(row, col));
+ return derived()._functor()(nestedExpression().const_cast_derived().coeffRef(row, col));
}
EIGEN_STRONG_INLINE Scalar& coeffRef(int index)
{
- return derived()._functor()(matrix().const_cast_derived().coeffRef(index));
+ return derived()._functor()(nestedExpression().const_cast_derived().coeffRef(index));
}
};