diff options
author | Gael Guennebaud <g.gael@free.fr> | 2012-07-05 21:58:01 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2012-07-05 21:58:01 +0200 |
commit | 7bfd8eabffd02bf32d52d5557d95c4be3ab6ef0d (patch) | |
tree | acc00cc87a030a87563073b6daa89b2efd9118b5 /Eigen | |
parent | 5dbdde0420ef8173656392d5bdbec701b0969361 (diff) |
fix compilation with MSVC
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Geometry/Scaling.h | 4 | ||||
-rw-r--r-- | Eigen/src/Geometry/Transform.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Geometry/Scaling.h b/Eigen/src/Geometry/Scaling.h index 65364f07f..b31c662a3 100644 --- a/Eigen/src/Geometry/Scaling.h +++ b/Eigen/src/Geometry/Scaling.h @@ -75,9 +75,9 @@ public: /** Concatenates a uniform scaling and an affine transformation */ 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()); return res; } diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index b2a503ad2..706311f4a 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -545,9 +545,9 @@ public: inline Transform& operator=(const UniformScaling<Scalar>& t); 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()); return res; } |