mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-18 14:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix super-nasty bug in the declaration of the storage array of fixed-size matrices.

Browse Source 
Also some simplifications.
This commit is contained in:
Benoit Jacob 2007-09-30 14:56:11 +00:00
parent 7d41ad9d90
commit 023773beaa
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal/MatrixOps.h
View File

@ -48,7 +48,7 @@ template<typename Lhs, typename Rhs> class EiSum
EiSum(const EiSum& other) EiSum(const EiSum& other)
: m_lhs(other.m_lhs), m_rhs(other.m_rhs) {} : m_lhs(other.m_lhs), m_rhs(other.m_rhs) {}
EI_INHERIT_ASSIGNMENT_OPERATORS(EiSum) EI_INHERIT_ASSIGNMENT_OPERATORS(EiSum)
private: private:
@ -194,8 +194,7 @@ template<typename OtherDerived>
Derived & Derived &
EiObject<Scalar, Derived>::operator+=(const EiObject<Scalar, OtherDerived>& other) EiObject<Scalar, Derived>::operator+=(const EiObject<Scalar, OtherDerived>& other)
{ {
*this = *this + other; return *this = *this + other;
return *static_cast<Derived*>(this);
} }
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
@ -203,8 +202,7 @@ template<typename OtherDerived>
Derived & Derived &
EiObject<Scalar, Derived>::operator-=(const EiObject<Scalar, OtherDerived> &other) EiObject<Scalar, Derived>::operator-=(const EiObject<Scalar, OtherDerived> &other)
{ {
*this = *this - other; return *this = *this - other;
return *static_cast<Derived*>(this);
} }
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
@ -212,8 +210,7 @@ template<typename OtherDerived>
Derived & Derived &
EiObject<Scalar, Derived>::operator*=(const EiObject<Scalar, OtherDerived> &other) EiObject<Scalar, Derived>::operator*=(const EiObject<Scalar, OtherDerived> &other)
{ {
*this = *this * other; return *this = *this * other;
return *static_cast<Derived*>(this);
} }
#endif // EI_MATRIXOPS_H #endif // EI_MATRIXOPS_H

1
src/internal/MatrixRef.h
View File

@ -48,7 +48,6 @@ template<typename MatrixType> class EiMatrixConstRef
return m_matrix._read(row, col); return m_matrix._read(row, col);
} }
protected:
const MatrixType& m_matrix; const MatrixType& m_matrix;
}; };

2
src/internal/MatrixStorage.h
View File

@ -32,7 +32,7 @@ template<typename Scalar,
class EiMatrixStorage class EiMatrixStorage
{ {
protected: protected:
Scalar m_array[RowsAtCompileTime * RowsAtCompileTime]; Scalar m_array[RowsAtCompileTime * ColsAtCompileTime];
void resize(int rows, int cols) void resize(int rows, int cols)
{ assert(rows == RowsAtCompileTime && cols == ColsAtCompileTime); } { assert(rows == RowsAtCompileTime && cols == ColsAtCompileTime); }

6
src/internal/ScalarOps.h
View File

@ -92,16 +92,14 @@ template<typename Scalar, typename Derived> \
Derived & \ Derived & \
EiObject<Scalar, Derived>::operator*=(const OtherScalar &other) \ EiObject<Scalar, Derived>::operator*=(const OtherScalar &other) \
{ \ { \
*this = *this * other; \ return *this = *this * other; \
return *static_cast<Derived*>(this); \
} \ } \
\ \
template<typename Scalar, typename Derived> \ template<typename Scalar, typename Derived> \
Derived & \ Derived & \
EiObject<Scalar, Derived>::operator/=(const OtherScalar &other) \ EiObject<Scalar, Derived>::operator/=(const OtherScalar &other) \
{ \ { \
*this = *this / other; \ return *this = *this / other; \
return *static_cast<Derived*>(this); \
} }
EI_MAKE_SCALAR_OPS(int) EI_MAKE_SCALAR_OPS(int)