Fix enum conversion warnings in BooleanRedux.

This commit is contained in:
Antonio Sanchez 2022-03-02 11:18:17 -08:00 committed by Antonio Sánchez
parent 711803c427
commit 55c7400db5

View File

@ -20,7 +20,7 @@ template<typename Derived, int UnrollCount, int InnerSize>
struct all_unroller struct all_unroller
{ {
enum { enum {
IsRowMajor = (Derived::Flags & RowMajor), IsRowMajor = (int(Derived::Flags) & int(RowMajor)),
i = (UnrollCount-1) / InnerSize, i = (UnrollCount-1) / InnerSize,
j = (UnrollCount-1) % InnerSize j = (UnrollCount-1) % InnerSize
}; };
@ -47,7 +47,7 @@ template<typename Derived, int UnrollCount, int InnerSize>
struct any_unroller struct any_unroller
{ {
enum { enum {
IsRowMajor = (Derived::Flags & RowMajor), IsRowMajor = (int(Derived::Flags) & int(RowMajor)),
i = (UnrollCount-1) / InnerSize, i = (UnrollCount-1) / InnerSize,
j = (UnrollCount-1) % InnerSize j = (UnrollCount-1) % InnerSize
}; };
@ -86,7 +86,7 @@ EIGEN_DEVICE_FUNC inline bool DenseBase<Derived>::all() const
enum { enum {
unroll = SizeAtCompileTime != Dynamic unroll = SizeAtCompileTime != Dynamic
&& SizeAtCompileTime * (int(Evaluator::CoeffReadCost) + int(NumTraits<Scalar>::AddCost)) <= EIGEN_UNROLLING_LIMIT, && SizeAtCompileTime * (int(Evaluator::CoeffReadCost) + int(NumTraits<Scalar>::AddCost)) <= EIGEN_UNROLLING_LIMIT,
IsRowMajor = (internal::traits<Derived>::Flags & RowMajor), IsRowMajor = (int(internal::traits<Derived>::Flags) & int(RowMajor)),
InnerSizeAtCompileTime = IsRowMajor ? internal::traits<Derived>::ColsAtCompileTime : internal::traits<Derived>::RowsAtCompileTime InnerSizeAtCompileTime = IsRowMajor ? internal::traits<Derived>::ColsAtCompileTime : internal::traits<Derived>::RowsAtCompileTime
}; };
Evaluator evaluator(derived()); Evaluator evaluator(derived());
@ -112,7 +112,7 @@ EIGEN_DEVICE_FUNC inline bool DenseBase<Derived>::any() const
enum { enum {
unroll = SizeAtCompileTime != Dynamic unroll = SizeAtCompileTime != Dynamic
&& SizeAtCompileTime * (int(Evaluator::CoeffReadCost) + int(NumTraits<Scalar>::AddCost)) <= EIGEN_UNROLLING_LIMIT, && SizeAtCompileTime * (int(Evaluator::CoeffReadCost) + int(NumTraits<Scalar>::AddCost)) <= EIGEN_UNROLLING_LIMIT,
IsRowMajor = (internal::traits<Derived>::Flags & RowMajor), IsRowMajor = (int(internal::traits<Derived>::Flags) & int(RowMajor)),
InnerSizeAtCompileTime = IsRowMajor ? internal::traits<Derived>::ColsAtCompileTime : internal::traits<Derived>::RowsAtCompileTime InnerSizeAtCompileTime = IsRowMajor ? internal::traits<Derived>::ColsAtCompileTime : internal::traits<Derived>::RowsAtCompileTime
}; };
Evaluator evaluator(derived()); Evaluator evaluator(derived());