From bdd7c6c88a0b8cb931480e04e33a17aa08022e06 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 11 Jun 2010 07:56:50 -0400 Subject: change the value of Dynamic to -1, since the index type is now configurable. remove EIGEN_ENUM_MIN/MAX, implement new macros instead --- Eigen/src/Core/Map.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Eigen/src/Core/Map.h') 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 > { 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, -- cgit v1.2.3