diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2021-06-10 17:17:39 -0700 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2021-06-10 17:17:39 -0700 |
| commit | f64b2954c711b7846ae6ae228c5f14bd8dd56ec4 (patch) | |
| tree | 4186deb89a49f0712eef14dff7a1569756c5fe0a /Eigen/src/Core/CoreEvaluators.h | |
| parent | 001a57519a7aa909d3bf0cd8c6ec8a9cd19d9c70 (diff) | |
Fix c++20 warnings about using enums in arithmetic expressions.
Diffstat (limited to 'Eigen/src/Core/CoreEvaluators.h')
| -rw-r--r-- | Eigen/src/Core/CoreEvaluators.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/CoreEvaluators.h b/Eigen/src/Core/CoreEvaluators.h index 66e030b1c..97231f99d 100644 --- a/Eigen/src/Core/CoreEvaluators.h +++ b/Eigen/src/Core/CoreEvaluators.h @@ -561,7 +561,7 @@ struct unary_evaluator<CwiseUnaryOp<UnaryOp, ArgType>, IndexBased > typedef CwiseUnaryOp<UnaryOp, ArgType> XprType; enum { - CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<UnaryOp>::Cost, + CoeffReadCost = int(evaluator<ArgType>::CoeffReadCost) + int(functor_traits<UnaryOp>::Cost), Flags = evaluator<ArgType>::Flags & (HereditaryBits | LinearAccessBit | (functor_traits<UnaryOp>::PacketAccess ? PacketAccessBit : 0)), @@ -736,7 +736,7 @@ struct binary_evaluator<CwiseBinaryOp<BinaryOp, Lhs, Rhs>, IndexBased, IndexBase typedef CwiseBinaryOp<BinaryOp, Lhs, Rhs> XprType; enum { - CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost, + CoeffReadCost = int(evaluator<Lhs>::CoeffReadCost) + int(evaluator<Rhs>::CoeffReadCost) + int(functor_traits<BinaryOp>::Cost), LhsFlags = evaluator<Lhs>::Flags, RhsFlags = evaluator<Rhs>::Flags, @@ -817,7 +817,7 @@ struct unary_evaluator<CwiseUnaryView<UnaryOp, ArgType>, IndexBased> typedef CwiseUnaryView<UnaryOp, ArgType> XprType; enum { - CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<UnaryOp>::Cost, + CoeffReadCost = int(evaluator<ArgType>::CoeffReadCost) + int(functor_traits<UnaryOp>::Cost), Flags = (evaluator<ArgType>::Flags & (HereditaryBits | LinearAccessBit | DirectAccessBit)), |