diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-01 09:49:15 +0100 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-01 09:49:15 +0100 |
| commit | 88be82679171c3ef13c432949f4b635482b422e3 (patch) | |
| tree | 1f5a2ff78cbdfd806ac2a7c7f7a06fba2afc6b9f /Eigen | |
| parent | 82971a5dcda3dcb36465c0984f69a98a31baf7e7 (diff) | |
Removed NestByValue dependency from MatrixBase::select().
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Array/Select.h | 8 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 4 |
2 files changed, 6 insertions, 6 deletions
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<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix, */ template<typename Derived> template<typename ThenDerived> -inline const Select<Derived,ThenDerived, NestByValue<typename ThenDerived::ConstantReturnType> > +inline const Select<Derived,ThenDerived, typename ThenDerived::ConstantReturnType> MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix, typename ThenDerived::Scalar elseScalar) const { - return Select<Derived,ThenDerived,NestByValue<typename ThenDerived::ConstantReturnType> >( + return Select<Derived,ThenDerived,typename ThenDerived::ConstantReturnType>( derived(), thenMatrix.derived(), ThenDerived::Constant(rows(),cols(),elseScalar)); } @@ -148,11 +148,11 @@ MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix, */ template<typename Derived> template<typename ElseDerived> -inline const Select<Derived, NestByValue<typename ElseDerived::ConstantReturnType>, ElseDerived > +inline const Select<Derived, typename ElseDerived::ConstantReturnType, ElseDerived > MatrixBase<Derived>::select(typename ElseDerived::Scalar thenScalar, const MatrixBase<ElseDerived>& elseMatrix) const { - return Select<Derived,NestByValue<typename ElseDerived::ConstantReturnType>,ElseDerived>( + return Select<Derived,typename ElseDerived::ConstantReturnType,ElseDerived>( 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<typename Derived> class MatrixBase const MatrixBase<ElseDerived>& elseMatrix) const; template<typename ThenDerived> - inline const Select<Derived,ThenDerived, NestByValue<typename ThenDerived::ConstantReturnType> > + inline const Select<Derived,ThenDerived, typename ThenDerived::ConstantReturnType> select(const MatrixBase<ThenDerived>& thenMatrix, typename ThenDerived::Scalar elseScalar) const; template<typename ElseDerived> - inline const Select<Derived, NestByValue<typename ElseDerived::ConstantReturnType>, ElseDerived > + inline const Select<Derived, typename ElseDerived::ConstantReturnType, ElseDerived > select(typename ElseDerived::Scalar thenScalar, const MatrixBase<ElseDerived>& elseMatrix) const; template<int p> RealScalar lpNorm() const; |