a couple of fixes

This commit is contained in:
Gael Guennebaud 2010-01-06 17:16:30 +01:00
parent a0efdd843c
commit c11300dbd5
2 changed files with 3 additions and 10 deletions

View File

@ -148,14 +148,6 @@ template<typename Derived> class ArrayBase
template<typename OtherDerived> template<typename OtherDerived>
Derived& operator/=(const ArrayBase<OtherDerived>& other); 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: public:
MatrixWrapper<Derived> matrix() { return derived(); } MatrixWrapper<Derived> matrix() { return derived(); }
const MatrixWrapper<Derived> matrix() const { return derived(); } const MatrixWrapper<Derived> matrix() const { return derived(); }

View File

@ -81,11 +81,12 @@ struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _DirectAccessStatus> >
}; };
template<typename MatrixType, int BlockRows, int BlockCols, int _DirectAccessStatus> class Block 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: 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; class InnerIterator;