From 30ec34de362744fa9a3e82573cb23662aaafbf5a Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sat, 5 Apr 2008 14:20:30 +0000 Subject: [PATCH] fix compilation (finish removal of EIGEN_UNROLLED_LOOPS) --- Eigen/src/Core/Redux.h | 12 +++--------- 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 ei_result_of::Scalar)>::type MatrixBase::redux(const BinaryOp& func) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_redux_unroller0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived(), func); @@ -293,9 +291,7 @@ struct ei_any_unroller template bool MatrixBase::all(void) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_all_unroller0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived()); @@ -315,9 +311,7 @@ bool MatrixBase::all(void) const template bool MatrixBase::any(void) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_any_unroller0 && 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 template void MatrixBase::visit(Visitor& visitor) const { - if(EIGEN_UNROLLED_LOOPS - && SizeAtCompileTime != Dynamic - && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) + if(SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) return ei_visitor_unroller0 && SizeAtCompileTime <= EIGEN_UNROLLING_LIMIT) ? SizeAtCompileTime : Dynamic>::run(derived(), visitor);