diff options
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Array/ArrayBase.h | 8 | ||||
| -rw-r--r-- | Eigen/src/Core/Block.h | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Eigen/src/Array/ArrayBase.h b/Eigen/src/Array/ArrayBase.h index 9e8d0c927..0effa2e2d 100644 --- a/Eigen/src/Array/ArrayBase.h +++ b/Eigen/src/Array/ArrayBase.h @@ -148,14 +148,6 @@ template<typename Derived> class ArrayBase template<typename OtherDerived> Derived& operator/=(const ArrayBase<OtherDerived>& other); - template<typename OtherDerived> - inline bool operator==(const ArrayBase<OtherDerived>& other) const - { return cwiseEqual(other).all(); } - - template<typename OtherDerived> - inline bool operator!=(const ArrayBase<OtherDerived>& other) const - { return cwiseNotEqual(other).all(); } - public: MatrixWrapper<Derived> matrix() { return derived(); } const MatrixWrapper<Derived> matrix() const { return derived(); } diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 461652410..fa63d27dc 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -81,11 +81,12 @@ struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> > }; template<typename MatrixType, int BlockRows, int BlockCols, int _DirectAccessStatus> class Block - :public MatrixType::template MakeBase< Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> >::Type + : public MatrixType::template MakeBase< Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> >::Type { public: - EIGEN_GENERIC_PUBLIC_INTERFACE(Block) + typedef typename MatrixType::template MakeBase< Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> >::Type Base; + _EIGEN_DENSE_PUBLIC_INTERFACE(Block) class InnerIterator; |