diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-03-12 13:34:11 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-03-12 13:34:11 +0100 |
| commit | 8dd3b716e39d4b4b472b948de1af20838bf17493 (patch) | |
| tree | 3fa4e90f1a6caf23e5028c8c5025e04ad27a8768 /Eigen/src/Core/MapBase.h | |
| parent | 7eefdb948c1ff372f85991ff3f9d998e66a554d9 (diff) | |
Move evaluation related flags from traits to evaluator and fix evaluators of MapBase and Replicate
Diffstat (limited to 'Eigen/src/Core/MapBase.h')
| -rw-r--r-- | Eigen/src/Core/MapBase.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Eigen/src/Core/MapBase.h b/Eigen/src/Core/MapBase.h index ffa1371c2..de1424b09 100644 --- a/Eigen/src/Core/MapBase.h +++ b/Eigen/src/Core/MapBase.h @@ -161,11 +161,16 @@ template<typename Derived> class MapBase<Derived, ReadOnlyAccessors> EIGEN_DEVICE_FUNC void checkSanity() const { +#ifndef EIGEN_TEST_EVALUATORS + // moved to evaluator 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) % 16) == 0) && "data is not aligned"); +#else + eigen_assert(EIGEN_IMPLIES(internal::traits<Derived>::IsAligned, (size_t(m_data) % 16) == 0) && "data is not aligned"); +#endif + } PointerType m_data; |