diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-11 07:56:50 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-11 07:56:50 -0400 |
| commit | bdd7c6c88a0b8cb931480e04e33a17aa08022e06 (patch) | |
| tree | ecc28fd133ddabfccd76a925043e35003ada6e10 /Eigen/src/Core/Map.h | |
| parent | 52e8c42a005cb607ba87e4f028e143d6d91f5021 (diff) | |
change the value of Dynamic to -1, since the index type is now configurable.
remove EIGEN_ENUM_MIN/MAX, implement new macros instead
Diffstat (limited to 'Eigen/src/Core/Map.h')
| -rw-r--r-- | Eigen/src/Core/Map.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index 6ca24b77d..a1ab29ead 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -79,10 +79,14 @@ struct ei_traits<Map<PlainObjectType, MapOptions, StrideType> > { typedef typename PlainObjectType::Scalar Scalar; enum { - InnerStrideAtCompileTime = StrideType::InnerStrideAtCompileTime, - OuterStrideAtCompileTime = StrideType::OuterStrideAtCompileTime, - HasNoInnerStride = InnerStrideAtCompileTime <= 1, - HasNoOuterStride = OuterStrideAtCompileTime == 0, + InnerStrideAtCompileTime = StrideType::InnerStrideAtCompileTime == 0 + ? int(PlainObjectType::InnerStrideAtCompileTime) + : int(StrideType::InnerStrideAtCompileTime), + OuterStrideAtCompileTime = StrideType::OuterStrideAtCompileTime == 0 + ? int(PlainObjectType::OuterStrideAtCompileTime) + : int(StrideType::OuterStrideAtCompileTime), + HasNoInnerStride = InnerStrideAtCompileTime == 1, + HasNoOuterStride = StrideType::OuterStrideAtCompileTime == 0, HasNoStride = HasNoInnerStride && HasNoOuterStride, IsAligned = int(int(MapOptions)&Aligned)==Aligned, IsDynamicSize = PlainObjectType::SizeAtCompileTime==Dynamic, |