GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix ICE with gcc 3.4 and 4.0.1

Browse Source
This commit is contained in:
Gael Guennebaud 2010-12-10 09:59:44 +01:00
parent bacd531862
commit 5bc21c25c5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Eigen/src/Geometry/Transform.h
View File

@ -211,6 +211,11 @@ public:
typedef Block<MatrixType,Dim,1> TranslationPart; typedef Block<MatrixType,Dim,1> TranslationPart;
/** corresponding translation type */ /** corresponding translation type */
typedef Translation<Scalar,Dim> TranslationType; typedef Translation<Scalar,Dim> TranslationType;
// this intermediate enum is needed to avoid an ICE with gcc 3.4 and 4.0
enum { TransformTimeDiagonalMode = ((Mode==int(Isometry))?Affine:int(Mode)) };
/** The return type of the product between a diagonal matrix and a transform */
typedef Transform<Scalar,Dim,TransformTimeDiagonalMode> TransformTimeDiagonalReturnType;
protected: protected:
@ -381,10 +386,10 @@ public:
* mode is no isometry. In that case, the returned transform is an affinity. * mode is no isometry. In that case, the returned transform is an affinity.
*/ */
template<typename DiagonalDerived> template<typename DiagonalDerived>
inline const Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> inline const TransformTimeDiagonalReturnType
operator * (const DiagonalBase<DiagonalDerived> &b) const operator * (const DiagonalBase<DiagonalDerived> &b) const
{ {
Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> res(*this); TransformTimeDiagonalReturnType res(*this);
res.linear() *= b; res.linear() *= b;
return res; return res;
} }
@ -396,10 +401,10 @@ public:
* mode is no isometry. In that case, the returned transform is an affinity. * mode is no isometry. In that case, the returned transform is an affinity.
*/ */
template<typename DiagonalDerived> template<typename DiagonalDerived>
friend inline const Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> friend inline TransformTimeDiagonalReturnType
operator * (const DiagonalBase<DiagonalDerived> &a, const Transform &b) operator * (const DiagonalBase<DiagonalDerived> &a, const Transform &b)
{ {
Transform<Scalar,Dim,((Mode==(int)Isometry)?Affine:(int)Mode)> res; TransformTimeDiagonalReturnType res;
res.linear().noalias() = a*b.linear(); res.linear().noalias() = a*b.linear();
res.translation().noalias() = a*b.translation(); res.translation().noalias() = a*b.translation();
if (Mode!=int(AffineCompact)) if (Mode!=int(AffineCompact))