devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation with MSVC

Browse Source
This commit is contained in:
Gael Guennebaud
2012-07-05 21:58:01 +02:00
parent 5dbdde0420
commit 7bfd8eabff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Geometry/Scaling.h
View File

@@ -75,9 +75,9 @@ public:
/** Concatenates a uniform scaling and an affine transformation */ /** Concatenates a uniform scaling and an affine transformation */
template<int Dim, int Mode, int Options> template<int Dim, int Mode, int Options>
inline Transform<Scalar,Dim,int(Mode)==int(Isometry)?Affine:Mode> operator* (const Transform<Scalar,Dim, Mode, Options>& t) const inline Transform<Scalar,Dim,(int(Mode)==int(Isometry)?Affine:Mode)> operator* (const Transform<Scalar,Dim, Mode, Options>& t) const
{ {
Transform<Scalar,Dim,int(Mode)==int(Isometry)?Affine:Mode> res = t; Transform<Scalar,Dim,(int(Mode)==int(Isometry)?Affine:Mode)> res = t;
res.prescale(factor()); res.prescale(factor());
return res; return res;
} }

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

@@ -545,9 +545,9 @@ public:
inline Transform& operator=(const UniformScaling<Scalar>& t); inline Transform& operator=(const UniformScaling<Scalar>& t);
inline Transform& operator*=(const UniformScaling<Scalar>& s) { return scale(s.factor()); } inline Transform& operator*=(const UniformScaling<Scalar>& s) { return scale(s.factor()); }
inline Transform<Scalar,Dim,int(Mode)==int(Isometry)?Affine:Isometry> operator*(const UniformScaling<Scalar>& s) const inline Transform<Scalar,Dim,(int(Mode)==int(Isometry)?Affine:Isometry)> operator*(const UniformScaling<Scalar>& s) const
{ {
Transform<Scalar,Dim,int(Mode)==int(Isometry)?Affine:Isometry,Options> res = *this; Transform<Scalar,Dim,(int(Mode)==int(Isometry)?Affine:Isometry),Options> res = *this;
res.scale(s.factor()); res.scale(s.factor());
return res; return res;
} }