diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-03-12 13:34:11 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-03-12 13:34:11 +0100 |
| commit | 8dd3b716e39d4b4b472b948de1af20838bf17493 (patch) | |
| tree | 3fa4e90f1a6caf23e5028c8c5025e04ad27a8768 /Eigen/src/Core/CwiseNullaryOp.h | |
| parent | 7eefdb948c1ff372f85991ff3f9d998e66a554d9 (diff) | |
Move evaluation related flags from traits to evaluator and fix evaluators of MapBase and Replicate
Diffstat (limited to 'Eigen/src/Core/CwiseNullaryOp.h')
| -rw-r--r-- | Eigen/src/Core/CwiseNullaryOp.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 560e03f12..f9f127cc2 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -35,14 +35,15 @@ template<typename NullaryOp, typename PlainObjectType> struct traits<CwiseNullaryOp<NullaryOp, PlainObjectType> > : traits<PlainObjectType> { enum { +#ifndef EIGEN_TEST_EVALUATORS Flags = (traits<PlainObjectType>::Flags & ( HereditaryBits | (functor_has_linear_access<NullaryOp>::ret ? LinearAccessBit : 0) | (functor_traits<NullaryOp>::PacketAccess ? PacketAccessBit : 0))) - | (functor_traits<NullaryOp>::IsRepeatable ? 0 : EvalBeforeNestingBit) -#ifndef EIGEN_TEST_EVALUATORS - , + | (functor_traits<NullaryOp>::IsRepeatable ? 0 : EvalBeforeNestingBit), CoeffReadCost = functor_traits<NullaryOp>::Cost +#else + Flags = traits<PlainObjectType>::Flags & RowMajorBit #endif }; }; |