diff --git a/Eigen/src/Array/Select.h b/Eigen/src/Array/Select.h index 46c4a22ec..bc55147fd 100644 --- a/Eigen/src/Array/Select.h +++ b/Eigen/src/Array/Select.h @@ -131,11 +131,11 @@ MatrixBase::select(const MatrixBase& thenMatrix, */ template template -inline const Select > +inline const Select MatrixBase::select(const MatrixBase& thenMatrix, typename ThenDerived::Scalar elseScalar) const { - return Select >( + return Select( derived(), thenMatrix.derived(), ThenDerived::Constant(rows(),cols(),elseScalar)); } @@ -148,11 +148,11 @@ MatrixBase::select(const MatrixBase& thenMatrix, */ template template -inline const Select, ElseDerived > +inline const Select MatrixBase::select(typename ElseDerived::Scalar thenScalar, const MatrixBase& elseMatrix) const { - return Select,ElseDerived>( + return Select( derived(), ElseDerived::Constant(rows(),cols(),thenScalar), elseMatrix.derived()); } diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 9f62ceb8f..1cee31936 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -694,11 +694,11 @@ template class MatrixBase const MatrixBase& elseMatrix) const; template - inline const Select > + inline const Select select(const MatrixBase& thenMatrix, typename ThenDerived::Scalar elseScalar) const; template - inline const Select, ElseDerived > + inline const Select select(typename ElseDerived::Scalar thenScalar, const MatrixBase& elseMatrix) const; template RealScalar lpNorm() const;