diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-04-05 14:20:30 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-04-05 14:20:30 +0000 |
| commit | 30ec34de362744fa9a3e82573cb23662aaafbf5a (patch) | |
| tree | e52367c483c5c8a50d3df274ccbb5e83da5cb092 /Eigen | |
| parent | 61e58cf602849d4d71361fb7eaa25cb8b5a1196d (diff) | |
fix compilation (finish removal of EIGEN_UNROLLED_LOOPS)
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/Redux.h | 12 | ||||
| -rw-r--r-- | Eigen/src/Core/Visitor.h | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Eigen/src/Core/Redux.h b/Eigen/src/Core/Redux.h index 32d1eda49..bccfe42b4 100644 --- a/Eigen/src/Core/Redux.h +++ b/Eigen/src/Core/Redux.h @@ -171,9 +171,7 @@ template<typename BinaryOp> typename ei_result_of<BinaryOp(typename ei_traits<Derived>::Scalar)>::type MatrixBase<Derived>::redux(const BinaryOp& func) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_redux_unroller<BinaryOp, Derived, 0, (SizeAtCompileTime>0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived(), func); @@ -293,9 +291,7 @@ struct ei_any_unroller<Derived, Dynamic> template<typename Derived> bool MatrixBase<Derived>::all(void) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_all_unroller<Derived, (SizeAtCompileTime>0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived()); @@ -315,9 +311,7 @@ bool MatrixBase<Derived>::all(void) const template<typename Derived> bool MatrixBase<Derived>::any(void) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_any_unroller<Derived, (SizeAtCompileTime>0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived()); diff --git a/Eigen/src/Core/Visitor.h b/Eigen/src/Core/Visitor.h index 7e3a7b819..2cff3a576 100644 --- a/Eigen/src/Core/Visitor.h +++ b/Eigen/src/Core/Visitor.h @@ -74,9 +74,7 @@ template<typename Derived> template<typename Visitor> void MatrixBase<Derived>::visit(Visitor& visitor) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_visitor_unroller<Visitor, Derived, (SizeAtCompileTime>0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived(), visitor); |