diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2019-03-03 15:25:25 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2019-03-03 15:25:25 +0100 |
| commit | b0d406d91c62ff32153df43d5f698ceb02341ac7 (patch) | |
| tree | ad37e1e4371fd6b5a3267d80f59b531e878e303e /Eigen/src/Core | |
| parent | 9ba81cf0ff5461bb7876787ac9f80aadc2a4844d (diff) | |
Enable construction of Ref<VectorType> from a runtime vector.
Diffstat (limited to 'Eigen/src/Core')
| -rw-r--r-- | Eigen/src/Core/Ref.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Eigen/src/Core/Ref.h b/Eigen/src/Core/Ref.h index ac9502bc4..172c8ffb6 100644 --- a/Eigen/src/Core/Ref.h +++ b/Eigen/src/Core/Ref.h @@ -28,12 +28,13 @@ struct traits<Ref<_PlainObjectType, _Options, _StrideType> > template<typename Derived> struct match { enum { + IsVectorAtCompileTime = PlainObjectType::IsVectorAtCompileTime || Derived::IsVectorAtCompileTime, HasDirectAccess = internal::has_direct_access<Derived>::ret, - StorageOrderMatch = PlainObjectType::IsVectorAtCompileTime || Derived::IsVectorAtCompileTime || ((PlainObjectType::Flags&RowMajorBit)==(Derived::Flags&RowMajorBit)), + StorageOrderMatch = IsVectorAtCompileTime || ((PlainObjectType::Flags&RowMajorBit)==(Derived::Flags&RowMajorBit)), InnerStrideMatch = int(StrideType::InnerStrideAtCompileTime)==int(Dynamic) || int(StrideType::InnerStrideAtCompileTime)==int(Derived::InnerStrideAtCompileTime) || (int(StrideType::InnerStrideAtCompileTime)==0 && int(Derived::InnerStrideAtCompileTime)==1), - OuterStrideMatch = Derived::IsVectorAtCompileTime + OuterStrideMatch = IsVectorAtCompileTime || int(StrideType::OuterStrideAtCompileTime)==int(Dynamic) || int(StrideType::OuterStrideAtCompileTime)==int(Derived::OuterStrideAtCompileTime), // NOTE, this indirection of evaluator<Derived>::Alignment is needed // to workaround a very strange bug in MSVC related to the instantiation |