diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-09-14 17:34:54 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-09-14 17:34:54 +0200 |
| commit | 749b56f6af4f712ccc4235a4faf7c13e09b9f3a3 (patch) | |
| tree | bf77d6d609fee4e8dcf3b354582906502a4b1b90 /Eigen/src/Core/Redux.h | |
| parent | af9c9f7706bb7701a7224827e981ecc2f3bd9ac7 (diff) | |
| parent | 9452eb38f812194a676edc1b9eb9d08b7bc0f297 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/Redux.h')
| -rw-r--r-- | Eigen/src/Core/Redux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/Redux.h b/Eigen/src/Core/Redux.h index 438ad018a..0aeae88bc 100644 --- a/Eigen/src/Core/Redux.h +++ b/Eigen/src/Core/Redux.h @@ -230,7 +230,7 @@ struct redux_impl<Func, Derived, LinearVectorizedTraversal, NoUnrolling> const Index packetSize = packet_traits<Scalar>::size; const Index alignedStart = internal::first_aligned(mat); enum { - alignment = bool(Derived::Flags & DirectAccessBit) || bool(Derived::Flags & AlignedBit) + alignment = (bool(Derived::Flags & DirectAccessBit) && bool(packet_traits<Scalar>::AlignedOnScalar)) || bool(Derived::Flags & AlignedBit) ? Aligned : Unaligned }; const Index alignedSize2 = ((size-alignedStart)/(2*packetSize))*(2*packetSize); |