diff options
Diffstat (limited to 'Eigen/src/Core/Select.h')
-rw-r--r-- | Eigen/src/Core/Select.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/Select.h b/Eigen/src/Core/Select.h index 87993bbb5..abcba2d15 100644 --- a/Eigen/src/Core/Select.h +++ b/Eigen/src/Core/Select.h @@ -43,10 +43,13 @@ struct traits<Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> > ColsAtCompileTime = ConditionMatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = ConditionMatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = ConditionMatrixType::MaxColsAtCompileTime, - Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & HereditaryBits, + Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & HereditaryBits +#ifndef EIGEN_TEST_EVALUATORS + , CoeffReadCost = traits<typename remove_all<ConditionMatrixNested>::type>::CoeffReadCost + EIGEN_SIZE_MAX(traits<typename remove_all<ThenMatrixNested>::type>::CoeffReadCost, traits<typename remove_all<ElseMatrixNested>::type>::CoeffReadCost) +#endif }; }; } |