diff options
author | Gael Guennebaud <g.gael@free.fr> | 2010-02-12 09:41:56 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2010-02-12 09:41:56 +0100 |
commit | a76950bdab00e36ef7ad8a34e01fdd2e53594ec1 (patch) | |
tree | 817fdb1497fde696fc827dbb29202595ac79918d | |
parent | 1701a5d1f83028100799c7dabe55fcd767028e3d (diff) |
fix a couple of ICE with gcc 4.0.1
-rw-r--r-- | Eigen/src/Core/DenseStorageBase.h | 2 | ||||
-rw-r--r-- | Eigen/src/Householder/Householder.h | 6 | ||||
-rw-r--r-- | Eigen/src/LU/Determinant.h | 2 | ||||
-rw-r--r-- | test/product_notemporary.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/DenseStorageBase.h b/Eigen/src/Core/DenseStorageBase.h index 7006e3a95..89903d0f6 100644 --- a/Eigen/src/Core/DenseStorageBase.h +++ b/Eigen/src/Core/DenseStorageBase.h @@ -62,7 +62,7 @@ class DenseStorageBase : public _Base<Derived> typedef class Eigen::Map<Derived, Aligned> AlignedMapType; protected: - ei_matrix_storage<Scalar, MaxSizeAtCompileTime, RowsAtCompileTime, ColsAtCompileTime, Options> m_storage; + ei_matrix_storage<Scalar, Base::MaxSizeAtCompileTime, Base::RowsAtCompileTime, Base::ColsAtCompileTime, Options> m_storage; public: enum { NeedsToAlign = (!(Options&DontAlign)) diff --git a/Eigen/src/Householder/Householder.h b/Eigen/src/Householder/Householder.h index cfd3935fc..d86e287fa 100644 --- a/Eigen/src/Householder/Householder.h +++ b/Eigen/src/Householder/Householder.h @@ -45,7 +45,7 @@ void makeTrivialHouseholder( template<typename Derived> void MatrixBase<Derived>::makeHouseholderInPlace(Scalar& tau, RealScalar& beta) { - VectorBlock<Derived, ei_decrement_size<SizeAtCompileTime>::ret> essentialPart(derived(), 1, size()-1); + VectorBlock<Derived, ei_decrement_size<Base::SizeAtCompileTime>::ret> essentialPart(derived(), 1, size()-1); makeHouseholder(essentialPart, tau, beta); } @@ -99,7 +99,7 @@ void MatrixBase<Derived>::applyHouseholderOnTheLeft( const Scalar& tau, Scalar* workspace) { - Map<Matrix<Scalar, 1, ColsAtCompileTime, PlainMatrixType::Options, 1, MaxColsAtCompileTime> > tmp(workspace,cols()); + Map<Matrix<Scalar, 1, Base::ColsAtCompileTime, PlainMatrixType::Options, 1, Base::MaxColsAtCompileTime> > tmp(workspace,cols()); Block<Derived, EssentialPart::SizeAtCompileTime, Derived::ColsAtCompileTime> bottom(derived(), 1, 0, rows()-1, cols()); tmp.noalias() = essential.adjoint() * bottom; tmp += this->row(0); @@ -114,7 +114,7 @@ void MatrixBase<Derived>::applyHouseholderOnTheRight( const Scalar& tau, Scalar* workspace) { - Map<Matrix<Scalar, RowsAtCompileTime, 1, PlainMatrixType::Options, MaxRowsAtCompileTime, 1> > tmp(workspace,rows()); + Map<Matrix<Scalar, Base::RowsAtCompileTime, 1, PlainMatrixType::Options, Base::MaxRowsAtCompileTime, 1> > tmp(workspace,rows()); Block<Derived, Derived::RowsAtCompileTime, EssentialPart::SizeAtCompileTime> right(derived(), 0, 1, rows(), cols()-1); tmp.noalias() = right * essential.conjugate(); tmp += this->col(0); diff --git a/Eigen/src/LU/Determinant.h b/Eigen/src/LU/Determinant.h index bae01256e..fb6577f08 100644 --- a/Eigen/src/LU/Determinant.h +++ b/Eigen/src/LU/Determinant.h @@ -99,7 +99,7 @@ template<typename Derived> inline typename ei_traits<Derived>::Scalar MatrixBase<Derived>::determinant() const { assert(rows() == cols()); - typedef typename ei_nested<Derived,RowsAtCompileTime>::type Nested; + typedef typename ei_nested<Derived,Base::RowsAtCompileTime>::type Nested; Nested nested(derived()); return ei_determinant_impl<typename ei_cleantype<Nested>::type>::run(nested); } diff --git a/test/product_notemporary.cpp b/test/product_notemporary.cpp index 332858851..9084cde6b 100644 --- a/test/product_notemporary.cpp +++ b/test/product_notemporary.cpp @@ -112,7 +112,7 @@ template<typename MatrixType> void product_notemporary(const MatrixType& m) // Zero temporaries for lazy products ... VERIFY_EVALUATION_COUNT( Scalar tmp = 0; tmp += Scalar(RealScalar(1)) / (m3.transpose().lazyProduct(m3)).diagonal().sum(), 0 ); - // ... and even no temporary for even deeply (>=2) nested products + // ... and even no temporary for even deeply (>=2) nested products VERIFY_EVALUATION_COUNT( Scalar tmp = 0; tmp += Scalar(RealScalar(1)) / (m3.transpose() * m3).diagonal().sum(), 0 ); VERIFY_EVALUATION_COUNT( Scalar tmp = 0; tmp += Scalar(RealScalar(1)) / (m3.transpose() * m3).diagonal().array().abs().sum(), 0 ); |