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/MapBase.h | |
| parent | 47585c8ab238f6a49b8097e221fa4b30763ef942 (diff) | |
| parent | 963d338922e9ef1addcd29c1b43e9b66243207c0 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/MapBase.h')
| -rw-r--r-- | Eigen/src/Core/MapBase.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Eigen/src/Core/MapBase.h b/Eigen/src/Core/MapBase.h index de1424b09..927a59c50 100644 --- a/Eigen/src/Core/MapBase.h +++ b/Eigen/src/Core/MapBase.h @@ -166,11 +166,10 @@ template<typename Derived> class MapBase<Derived, ReadOnlyAccessors> EIGEN_STATIC_ASSERT(EIGEN_IMPLIES(internal::traits<Derived>::Flags&PacketAccessBit, internal::inner_stride_at_compile_time<Derived>::ret==1), PACKET_ACCESS_REQUIRES_TO_HAVE_INNER_STRIDE_FIXED_TO_1); - eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::Flags&AlignedBit, (size_t(m_data) % 16) == 0) && "data is not aligned"); + eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::Flags&AlignedBit, (size_t(m_data) % EIGEN_ALIGN_BYTES) == 0) && "data is not aligned"); #else - eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::IsAligned, (size_t(m_data) % 16) == 0) && "data is not aligned"); + eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::IsAligned, (size_t(m_data) % EIGEN_ALIGN_BYTES) == 0) && "data is not aligned"); #endif - } PointerType m_data; @@ -255,6 +254,8 @@ template<typename Derived> class MapBase<Derived, WriteAccessors> using Base::Base::operator=; }; +#undef EIGEN_STATIC_ASSERT_INDEX_BASED_ACCESS + } // end namespace Eigen #endif // EIGEN_MAPBASE_H |