diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-18 22:14:55 -0400 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-18 22:14:55 -0400 |
commit | 504a31f643468d05a10e3474b76a61e80022df59 (patch) | |
tree | 7a1e64c8e95c001a998aa27d9ccb31a68a197339 /Eigen/src/Core/Map.h | |
parent | 34b14c48f31e5b794d48fd083f5fa39d7b4a6411 (diff) |
renaming (MatrixType ---> whatever appropriate)
and documentation improvements
Diffstat (limited to 'Eigen/src/Core/Map.h')
-rw-r--r-- | Eigen/src/Core/Map.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index c7018ce53..eb7262bdb 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -30,7 +30,7 @@ * * \brief A matrix or vector expression mapping an existing array of data. * - * \param MatrixType the equivalent matrix type of the mapped data + * \param PlainObjectType the equivalent matrix type of the mapped data * \param Options specifies whether the pointer is \c Aligned, or \c Unaligned. * The default is \c Unaligned. * \param StrideType optionnally specifies strides. By default, Map assumes the memory layout @@ -73,11 +73,11 @@ * * \sa Matrix::Map() */ -template<typename MatrixType, int Options, typename StrideType> -struct ei_traits<Map<MatrixType, Options, StrideType> > - : public ei_traits<MatrixType> +template<typename PlainObjectType, int Options, typename StrideType> +struct ei_traits<Map<PlainObjectType, Options, StrideType> > + : public ei_traits<PlainObjectType> { - typedef typename MatrixType::Scalar Scalar; + typedef typename PlainObjectType::Scalar Scalar; enum { InnerStrideAtCompileTime = StrideType::InnerStrideAtCompileTime, OuterStrideAtCompileTime = StrideType::OuterStrideAtCompileTime, @@ -85,21 +85,21 @@ struct ei_traits<Map<MatrixType, Options, StrideType> > HasNoOuterStride = OuterStrideAtCompileTime == 0, HasNoStride = HasNoInnerStride && HasNoOuterStride, IsAligned = int(int(Options)&Aligned)==Aligned, - IsDynamicSize = MatrixType::SizeAtCompileTime==Dynamic, + IsDynamicSize = PlainObjectType::SizeAtCompileTime==Dynamic, KeepsPacketAccess = bool(HasNoInnerStride) && ( bool(IsDynamicSize) || HasNoOuterStride || ( OuterStrideAtCompileTime!=Dynamic && ((int(OuterStrideAtCompileTime)*sizeof(Scalar))%16)==0 ) ), - Flags0 = ei_traits<MatrixType>::Flags, + Flags0 = ei_traits<PlainObjectType>::Flags, Flags1 = IsAligned ? int(Flags0) | AlignedBit : int(Flags0) & ~AlignedBit, Flags2 = HasNoStride ? int(Flags1) : int(Flags1 & ~LinearAccessBit), Flags = KeepsPacketAccess ? int(Flags2) : (int(Flags2) & ~PacketAccessBit) }; }; -template<typename MatrixType, int Options, typename StrideType> class Map - : public MapBase<Map<MatrixType, Options, StrideType> > +template<typename PlainObjectType, int Options, typename StrideType> class Map + : public MapBase<Map<PlainObjectType, Options, StrideType> > { public: @@ -128,7 +128,7 @@ template<typename MatrixType, int Options, typename StrideType> class Map inline Map(const Scalar* data, const StrideType& stride = StrideType()) : Base(data), m_stride(stride) { - MatrixType::Base::_check_template_params(); + PlainObjectType::Base::_check_template_params(); } /** Constructor in the dynamic-size vector case. @@ -140,7 +140,7 @@ template<typename MatrixType, int Options, typename StrideType> class Map inline Map(const Scalar* data, int size, const StrideType& stride = StrideType()) : Base(data, size), m_stride(stride) { - MatrixType::Base::_check_template_params(); + PlainObjectType::Base::_check_template_params(); } /** Constructor in the dynamic-size matrix case. @@ -153,7 +153,7 @@ template<typename MatrixType, int Options, typename StrideType> class Map inline Map(const Scalar* data, int rows, int cols, const StrideType& stride = StrideType()) : Base(data, rows, cols), m_stride(stride) { - MatrixType::Base::_check_template_params(); + PlainObjectType::Base::_check_template_params(); } |