diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 4fce5ec09..bb44703cf 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -184,7 +184,7 @@ template EIGEN_STRONG_INLINE const typename DenseBase::ConstantReturnType DenseBase::Constant(int rows, int cols, const Scalar& value) { - return NullaryExpr(rows, cols, ei_scalar_constant_op(value)); + return DenseBase::NullaryExpr(rows, cols, ei_scalar_constant_op(value)); } /** \returns an expression of a constant matrix of value \a value @@ -206,7 +206,7 @@ template EIGEN_STRONG_INLINE const typename DenseBase::ConstantReturnType DenseBase::Constant(int size, const Scalar& value) { - return NullaryExpr(size, ei_scalar_constant_op(value)); + return DenseBase::NullaryExpr(size, ei_scalar_constant_op(value)); } /** \returns an expression of a constant matrix of value \a value @@ -223,7 +223,7 @@ EIGEN_STRONG_INLINE const typename DenseBase::ConstantReturnType DenseBase::Constant(const Scalar& value) { EIGEN_STATIC_ASSERT_FIXED_SIZE(Derived) - return NullaryExpr(RowsAtCompileTime, ColsAtCompileTime, ei_scalar_constant_op(value)); + return DenseBase::NullaryExpr(RowsAtCompileTime, ColsAtCompileTime, ei_scalar_constant_op(value)); } /** @@ -246,7 +246,7 @@ EIGEN_STRONG_INLINE const typename DenseBase::SequentialLinSpacedReturn DenseBase::LinSpaced(Sequential_t, const Scalar& low, const Scalar& high, int size) { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) - return NullaryExpr(size, ei_linspaced_op(low,high,size)); + return DenseBase::NullaryExpr(size, ei_linspaced_op(low,high,size)); } /** @@ -266,7 +266,7 @@ EIGEN_STRONG_INLINE const typename DenseBase::RandomAccessLinSpacedRetu DenseBase::LinSpaced(const Scalar& low, const Scalar& high, int size) { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived) - return NullaryExpr(size, ei_linspaced_op(low,high,size)); + return DenseBase::NullaryExpr(size, ei_linspaced_op(low,high,size)); } /** \returns true if all coefficients in this matrix are approximately equal to \a value, to within precision \a prec */ @@ -640,7 +640,7 @@ template EIGEN_STRONG_INLINE const typename MatrixBase::IdentityReturnType MatrixBase::Identity(int rows, int cols) { - return NullaryExpr(rows, cols, ei_scalar_identity_op()); + return DenseBase::NullaryExpr(rows, cols, ei_scalar_identity_op()); } /** \returns an expression of the identity matrix (not necessarily square). @@ -658,7 +658,7 @@ EIGEN_STRONG_INLINE const typename MatrixBase::IdentityReturnType MatrixBase::Identity() { EIGEN_STATIC_ASSERT_FIXED_SIZE(Derived) - return NullaryExpr(RowsAtCompileTime, ColsAtCompileTime, ei_scalar_identity_op()); + return MatrixBase::NullaryExpr(RowsAtCompileTime, ColsAtCompileTime, ei_scalar_identity_op()); } /** \returns true if *this is approximately equal to the identity matrix diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index e72217c40..796623637 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -83,7 +83,7 @@ template class DenseBase using Base::outerStride; using Base::rowStride; using Base::colStride; - using Base::CoeffReturnType; + using typename Base::CoeffReturnType; #endif // not EIGEN_PARSED_BY_DOXYGEN diff --git a/Eigen/src/Core/DenseCoeffsBase.h b/Eigen/src/Core/DenseCoeffsBase.h index ce9578838..ccf959b86 100644 --- a/Eigen/src/Core/DenseCoeffsBase.h +++ b/Eigen/src/Core/DenseCoeffsBase.h @@ -241,7 +241,7 @@ class DenseCoeffsBase : public DenseCoeffsBase typedef DenseCoeffsBase Base; typedef typename ei_traits::Scalar Scalar; - using Base::CoeffReturnType; + using typename Base::CoeffReturnType; using Base::coeff; using Base::rows; using Base::cols; diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index 2230680d1..e6599f9c8 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -152,6 +152,7 @@ template class TriangularView typedef typename MatrixType::PlainObject DenseMatrixType; typedef typename MatrixType::Nested MatrixTypeNested; typedef typename ei_cleantype::type _MatrixTypeNested; + using TriangularBase >::evalToLazy; enum { Mode = _Mode,