diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-12-27 16:55:47 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-12-27 16:55:47 +0100 |
| commit | ab69a7f6d19b22a98bbb3bef2f0567d20204b0a0 (patch) | |
| tree | d967efd03622808842bb00b507d64f25c2ed6778 /Eigen/src/SparseCore/SparseCwiseBinaryOp.h | |
| parent | d32a43e33a01631745aa4c0e450153f2f3ac6b9e (diff) | |
Cleanup because trait<CwiseBinaryOp>::Flags now expose the correct storage order
Diffstat (limited to 'Eigen/src/SparseCore/SparseCwiseBinaryOp.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseCwiseBinaryOp.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h index 526c7121b..145a7389e 100644 --- a/Eigen/src/SparseCore/SparseCwiseBinaryOp.h +++ b/Eigen/src/SparseCore/SparseCwiseBinaryOp.h @@ -212,8 +212,7 @@ public: enum { CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost, - // Expose storage order of the sparse expression - Flags = (XprType::Flags & ~RowMajorBit) | (int(Rhs::Flags)&RowMajorBit) + Flags = XprType::Flags }; explicit binary_evaluator(const XprType& xpr) @@ -300,8 +299,7 @@ public: enum { CoeffReadCost = evaluator<Lhs>::CoeffReadCost + evaluator<Rhs>::CoeffReadCost + functor_traits<BinaryOp>::Cost, - // Expose storage order of the sparse expression - Flags = (XprType::Flags & ~RowMajorBit) | (int(Lhs::Flags)&RowMajorBit) + Flags = XprType::Flags }; explicit binary_evaluator(const XprType& xpr) @@ -523,8 +521,7 @@ public: enum { CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, - // Expose storage order of the sparse expression - Flags = (XprType::Flags & ~RowMajorBit) | (int(RhsArg::Flags)&RowMajorBit) + Flags = XprType::Flags }; explicit sparse_conjunction_evaluator(const XprType& xpr) @@ -598,8 +595,7 @@ public: enum { CoeffReadCost = evaluator<LhsArg>::CoeffReadCost + evaluator<RhsArg>::CoeffReadCost + functor_traits<BinaryOp>::Cost, - // Expose storage order of the sparse expression - Flags = (XprType::Flags & ~RowMajorBit) | (int(LhsArg::Flags)&RowMajorBit) + Flags = XprType::Flags }; explicit sparse_conjunction_evaluator(const XprType& xpr) |