GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a couple of issues in the new Map.h

Browse Source
This commit is contained in:
Benoit Jacob 2008-06-27 01:42:44 +00:00
parent e27b2b95cf
commit 6de4871c8c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Eigen/src/Core/Map.h
View File

@ -50,8 +50,8 @@ struct ei_traits<Map<MatrixType, Alignment> >
MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime,
MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime,
Flags = MatrixType::Flags Flags = MatrixType::Flags
& (HereditaryBits | LinearAccessBit | DirectAccessBit) & ( (HereditaryBits | LinearAccessBit | DirectAccessBit)
& (Alignment == Aligned ? PacketAccessBit : 0), | (Alignment == Aligned ? PacketAccessBit : 0) ),
CoeffReadCost = NumTraits<Scalar>::ReadCost CoeffReadCost = NumTraits<Scalar>::ReadCost
}; };
}; };
@ -89,7 +89,7 @@ template<typename MatrixType, int Alignment> class Map
inline Scalar& coeffRef(int index) inline Scalar& coeffRef(int index)
{ {
return m_data[index]; return *const_cast<Scalar*>(m_data + index);
} }
template<int LoadMode> template<int LoadMode>
@ -111,7 +111,7 @@ template<typename MatrixType, int Alignment> class Map
inline void writePacket(int row, int col, const PacketScalar& x) inline void writePacket(int row, int col, const PacketScalar& x)
{ {
ei_pstoret<Scalar, PacketScalar, StoreMode == Aligned ? Alignment : Unaligned> ei_pstoret<Scalar, PacketScalar, StoreMode == Aligned ? Alignment : Unaligned>
(m_data + (Flags & RowMajorBit (const_cast<Scalar*>(m_data) + (Flags & RowMajorBit
? col + row * m_cols.value() ? col + row * m_cols.value()
: row + col * m_rows.value()), x); : row + col * m_rows.value()), x);
} }
@ -119,7 +119,8 @@ template<typename MatrixType, int Alignment> class Map
template<int StoreMode> template<int StoreMode>
inline void writePacket(int index, const PacketScalar& x) inline void writePacket(int index, const PacketScalar& x)
{ {
ei_pstoret<Scalar, PacketScalar, StoreMode == Aligned ? Alignment : Unaligned>(m_data + index, x); ei_pstoret<Scalar, PacketScalar, StoreMode == Aligned ? Alignment : Unaligned>
(const_cast<Scalar*>(m_data) + index, x);
} }
inline Map(const Scalar* data) : m_data(data), m_rows(RowsAtCompileTime), m_cols(ColsAtCompileTime) inline Map(const Scalar* data) : m_data(data), m_rows(RowsAtCompileTime), m_cols(ColsAtCompileTime)