diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2017-03-07 10:02:34 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2017-03-07 10:02:34 +0100 |
| commit | 659087b622e94f7e35a56b7ed2cb01b024c80a7b (patch) | |
| tree | b889099ee965b7d5a73e86fa1bdb8a1e93ad9e63 /Eigen/src/Core/StableNorm.h | |
| parent | a71943b9a432c8962f025b56313584f33111ace4 (diff) | |
bug #1400: fix stableNorm with EIGEN_DONT_ALIGN_STATICALLY
Diffstat (limited to 'Eigen/src/Core/StableNorm.h')
| -rw-r--r-- | Eigen/src/Core/StableNorm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/src/Core/StableNorm.h b/Eigen/src/Core/StableNorm.h index d2fe1e199..be04ed44d 100644 --- a/Eigen/src/Core/StableNorm.h +++ b/Eigen/src/Core/StableNorm.h @@ -170,7 +170,8 @@ MatrixBase<Derived>::stableNorm() const enum { CanAlign = ( (int(DerivedCopyClean::Flags)&DirectAccessBit) || (int(internal::evaluator<DerivedCopyClean>::Alignment)>0) // FIXME Alignment)>0 might not be enough - ) && (blockSize*sizeof(Scalar)*2<EIGEN_STACK_ALLOCATION_LIMIT) // ifwe cannot allocate on the stack, then let's not bother about this optimization + ) && (blockSize*sizeof(Scalar)*2<EIGEN_STACK_ALLOCATION_LIMIT) + && (EIGEN_MAX_STATIC_ALIGN_BYTES>0) // if we cannot allocate on the stack, then let's not bother about this optimization }; typedef typename internal::conditional<CanAlign, Ref<const Matrix<Scalar,Dynamic,1,0,blockSize,1>, internal::evaluator<DerivedCopyClean>::Alignment>, typename DerivedCopyClean::ConstSegmentReturnType>::type SegmentWrapper; |