diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-06-20 15:55:44 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-06-20 15:55:44 +0200 |
| commit | b29b81a1f46ad3b7340c9bbb8d1e23685e5ca756 (patch) | |
| tree | ec31545094cba7c9d72c9132963fa3fecd448726 /Eigen/src/Core/GeneralProduct.h | |
| parent | 47585c8ab238f6a49b8097e221fa4b30763ef942 (diff) | |
| parent | 963d338922e9ef1addcd29c1b43e9b66243207c0 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/GeneralProduct.h')
| -rw-r--r-- | Eigen/src/Core/GeneralProduct.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Eigen/src/Core/GeneralProduct.h b/Eigen/src/Core/GeneralProduct.h index f28d2e46c..734815986 100644 --- a/Eigen/src/Core/GeneralProduct.h +++ b/Eigen/src/Core/GeneralProduct.h @@ -69,8 +69,7 @@ template<typename Lhs, typename Rhs> struct product_type MaxDepth = EIGEN_SIZE_MIN_PREFER_FIXED(_Lhs::MaxColsAtCompileTime, _Rhs::MaxRowsAtCompileTime), Depth = EIGEN_SIZE_MIN_PREFER_FIXED(_Lhs::ColsAtCompileTime, - _Rhs::RowsAtCompileTime), - LargeThreshold = EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD + _Rhs::RowsAtCompileTime) }; // the splitting into different lines of code here, introducing the _select enums and the typedef below, @@ -424,7 +423,7 @@ struct gemv_static_vector_if<Scalar,Size,MaxSize,true> internal::plain_array<Scalar,EIGEN_SIZE_MIN_PREFER_FIXED(Size,MaxSize)+(ForceAlignment?PacketSize:0),0> m_data; EIGEN_STRONG_INLINE Scalar* data() { return ForceAlignment - ? reinterpret_cast<Scalar*>((reinterpret_cast<size_t>(m_data.array) & ~(size_t(15))) + 16) + ? reinterpret_cast<Scalar*>((reinterpret_cast<size_t>(m_data.array) & ~(size_t(EIGEN_ALIGN_BYTES-1))) + EIGEN_ALIGN_BYTES) : m_data.array; } #endif |