diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:54:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 06:54:34 +0000 |
| commit | 8e970d1f5c5808b37487a6273ba8a54fb5d6807f (patch) | |
| tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /Eigen/src/SparseCore/SparseCwiseUnaryOp.h | |
| parent | 2cb17b6ddd9931ee0e9e070ed5de1f8ba7a78368 (diff) | |
| parent | edb0ad5bb04b48aab7dd0978f0475edd3550de7c (diff) | |
| download | eigen-8e970d1f5c5808b37487a6273ba8a54fb5d6807f.tar.gz | |
Snap for 8564071 from edb0ad5bb04b48aab7dd0978f0475edd3550de7c to mainline-resolv-releaseaml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000android13-mainline-resolv-release
Change-Id: I66ea3b58c7816d2a303fa420e3b3080ad547c49b
Diffstat (limited to 'Eigen/src/SparseCore/SparseCwiseUnaryOp.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseCwiseUnaryOp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Eigen/src/SparseCore/SparseCwiseUnaryOp.h b/Eigen/src/SparseCore/SparseCwiseUnaryOp.h index ea7973790..32dac0f78 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 }; @@ -49,6 +49,7 @@ template<typename UnaryOp, typename ArgType> class unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::InnerIterator : public unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::EvalIterator { + protected: typedef typename XprType::Scalar Scalar; typedef typename unary_evaluator<CwiseUnaryOp<UnaryOp,ArgType>, IteratorBased>::EvalIterator Base; public: @@ -78,7 +79,7 @@ struct unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased> class InnerIterator; enum { - CoeffReadCost = evaluator<ArgType>::CoeffReadCost + functor_traits<ViewOp>::Cost, + CoeffReadCost = int(evaluator<ArgType>::CoeffReadCost) + int(functor_traits<ViewOp>::Cost), Flags = XprType::Flags }; @@ -99,6 +100,7 @@ template<typename ViewOp, typename ArgType> class unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::InnerIterator : public unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::EvalIterator { + protected: typedef typename XprType::Scalar Scalar; typedef typename unary_evaluator<CwiseUnaryView<ViewOp,ArgType>, IteratorBased>::EvalIterator Base; public: |