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/SparseCore | |
| parent | 001a57519a7aa909d3bf0cd8c6ec8a9cd19d9c70 (diff) | |
Fix c++20 warnings about using enums in arithmetic expressions.
Diffstat (limited to 'Eigen/src/SparseCore')
| -rw-r--r-- | Eigen/src/SparseCore/SparseCwiseBinaryOp.h | 6 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseCwiseUnaryOp.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h index 6130bab43..ff1e49c45 100644 --- a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h +++ b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h @@ -126,7 +126,7 @@ public: 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), Flags = XprType::Flags }; @@ -530,7 +530,7 @@ public: enum { - CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, + CoeffReadCost = int(evaluator<LhsArg>::CoeffReadCost) + int(evaluator<RhsArg>::CoeffReadCost) + int(functor_traits<BinaryOp>::Cost), Flags = XprType::Flags }; @@ -604,7 +604,7 @@ public: enum { - CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, + CoeffReadCost = int(evaluator<LhsArg>::CoeffReadCost) + int(evaluator<RhsArg>::CoeffReadCost) + int(functor_traits<BinaryOp>::Cost), Flags = XprType::Flags }; diff --git a/Eigen/src/SparseCore/SparseCwiseUnaryOp.h b/Eigen/src/SparseCore/SparseCwiseUnaryOp.h index df6c28d2b..edf844cb8 100644 --- a/Eigen/src/SparseCore/SparseCwiseUnaryOp.h +++ b/Eigen/src/SparseCore/SparseCwiseUnaryOp.h @@ -24,7 +24,7 @@ struct unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased> class InnerIterator; enum { - CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<UnaryOp>::Cost, + CoeffReadCost = int(evaluator<ArgType>::CoeffReadCost) + int(functor_traits<UnaryOp>::Cost), Flags = XprType::Flags }; |