diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-06-17 17:25:18 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-06-17 17:25:18 +0200 |
| commit | 3acd007f9d24e94e9266f7ff9cad7adac2934fad (patch) | |
| tree | 98417cf09c88d6b4c50ebd22b5520f3a7dda554d | |
| parent | 9637574e2b3dd3e73fe287bd472ab5538b11d3b4 (diff) | |
more compilation fixes for ICC
| -rw-r--r-- | Eigen/src/Array/BooleanRedux.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Eigen/src/Array/BooleanRedux.h b/Eigen/src/Array/BooleanRedux.h index b9de54029..6f6a46a8f 100644 --- a/Eigen/src/Array/BooleanRedux.h +++ b/Eigen/src/Array/BooleanRedux.h @@ -89,10 +89,12 @@ struct ei_any_unroller<Derived, Dynamic> template<typename Derived> inline bool DenseBase<Derived>::all() const { - const bool unroll = SizeAtCompileTime != Dynamic - && CoeffReadCost != Dynamic - && NumTraits<Scalar>::AddCost != Dynamic - && SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT; + enum { + unroll = SizeAtCompileTime != Dynamic + && CoeffReadCost != Dynamic + && NumTraits<Scalar>::AddCost != Dynamic + && SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT + }; if(unroll) return ei_all_unroller<Derived, unroll ? int(SizeAtCompileTime) : Dynamic @@ -115,10 +117,12 @@ inline bool DenseBase<Derived>::all() const template<typename Derived> inline bool DenseBase<Derived>::any() const { - const bool unroll = SizeAtCompileTime != Dynamic - && CoeffReadCost != Dynamic - && NumTraits<Scalar>::AddCost != Dynamic - && SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT; + enum { + unroll = SizeAtCompileTime != Dynamic + && CoeffReadCost != Dynamic + && NumTraits<Scalar>::AddCost != Dynamic + && SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT + }; if(unroll) return ei_any_unroller<Derived, unroll ? int(SizeAtCompileTime) : Dynamic |