diff options
| author |  Konstantinos Margaritis <konstantinos.margaritis@freevec.org> | 2014-09-21 14:02:51 +0300 |
|---|---|---|
| committer | Konstantinos Margaritis <konstantinos.margaritis@freevec.org> | 2014-09-21 14:02:51 +0300 |
| commit | 60e093a9dce2f8d4c0f3b2ea3e0386d5f01bff8d (patch) | |
| tree | 05442eeff0bcfe7fe85ce59cf5fa72aa06ee2a07 /Eigen/src/Core/Select.h | |
| parent | 56408504e4e3fa5f9c59d9edac14ca1ba1255e5a (diff) | |
| parent | 03dd4dd91a5d8963f56eebe3b9d2eb924bc06e02 (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'Eigen/src/Core/Select.h')
| -rw-r--r-- | Eigen/src/Core/Select.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Eigen/src/Core/Select.h b/Eigen/src/Core/Select.h index 87993bbb5..0cb85a4ad 100644 --- a/Eigen/src/Core/Select.h +++ b/Eigen/src/Core/Select.h @@ -43,10 +43,7 @@ struct traits<Select<ConditionMatrixType, ThenMatrixType, ElseMatrixType> > ColsAtCompileTime = ConditionMatrixType::ColsAtCompileTime, MaxRowsAtCompileTime = ConditionMatrixType::MaxRowsAtCompileTime, MaxColsAtCompileTime = ConditionMatrixType::MaxColsAtCompileTime, - Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & HereditaryBits, - 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) + Flags = (unsigned int)ThenMatrixType::Flags & ElseMatrixType::Flags & RowMajorBit }; }; } |