diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-02-25 21:07:30 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-02-25 21:07:30 -0500 |
| commit | b1c6c215a43850b2bc5bdc393ab5a1179e858024 (patch) | |
| tree | 9ae1234383bef2204802606501a47bb5c05ec1d2 /Eigen/src/Core/DenseBase.h | |
| parent | 769641bc58745fecc1fa4e537466a1fff48f4a8a (diff) | |
| parent | 90e4a605ef920759a23cdbd24e6e7b69ce549162 (diff) | |
merge
Diffstat (limited to 'Eigen/src/Core/DenseBase.h')
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 2078f023b..5682d7278 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -40,7 +40,7 @@ template<typename Derived> class DenseBase : public ei_special_scalar_op_base<Derived,typename ei_traits<Derived>::Scalar, typename NumTraits<typename ei_traits<Derived>::Scalar>::Real> #else - : public AnyMatrixBase<Derived> + : public EigenBase<Derived> #endif // not EIGEN_PARSED_BY_DOXYGEN { public: @@ -53,8 +53,8 @@ template<typename Derived> class DenseBase typedef typename ei_traits<Derived>::Scalar Scalar; typedef typename ei_packet_traits<Scalar>::type PacketScalar; - using AnyMatrixBase<Derived>::derived; - using AnyMatrixBase<Derived>::const_cast_derived; + using EigenBase<Derived>::derived; + using EigenBase<Derived>::const_cast_derived; #endif // not EIGEN_PARSED_BY_DOXYGEN enum { @@ -292,13 +292,13 @@ template<typename Derived> class DenseBase Derived& operator=(const DenseBase& other); template<typename OtherDerived> - Derived& operator=(const AnyMatrixBase<OtherDerived> &other); + Derived& operator=(const EigenBase<OtherDerived> &other); template<typename OtherDerived> - Derived& operator+=(const AnyMatrixBase<OtherDerived> &other); + Derived& operator+=(const EigenBase<OtherDerived> &other); template<typename OtherDerived> - Derived& operator-=(const AnyMatrixBase<OtherDerived> &other); + Derived& operator-=(const EigenBase<OtherDerived> &other); template<typename OtherDerived> Derived& operator=(const ReturnByValue<OtherDerived>& func); |