diff options
author | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-03-11 12:18:32 +0100 |
---|---|---|
committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2014-03-11 12:18:32 +0100 |
commit | bbc0ada12a3ae1531860205b7f1e21f991bb6273 (patch) | |
tree | 1234d476927a6995936f06f9bd067337b779d647 /Eigen/src/Geometry | |
parent | 1b3d7fc04ccfe9a2f6f7d06def894538b9f495d7 (diff) |
Avoid stupid "enumeral mismatch in conditional expression" warnings in GCC
Diffstat (limited to 'Eigen/src/Geometry')
-rw-r--r-- | Eigen/src/Geometry/Transform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index 0a5012cfe..f40644011 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -530,9 +530,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:Mode)> operator*(const UniformScaling<Scalar>& s) const + inline TransformTimeDiagonalReturnType operator*(const UniformScaling<Scalar>& s) const { - Transform<Scalar,Dim,(int(Mode)==int(Isometry)?Affine:Mode),Options> res = *this; + TransformTimeDiagonalReturnType res = *this; res.scale(s.factor()); return res; } |