From bbc0ada12a3ae1531860205b7f1e21f991bb6273 Mon Sep 17 00:00:00 2001 From: Christoph Hertzberg Date: Tue, 11 Mar 2014 12:18:32 +0100 Subject: [PATCH] Avoid stupid "enumeral mismatch in conditional expression" warnings in GCC --- Eigen/src/Geometry/Transform.h | 4 ++-- 1 file 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& t); inline Transform& operator*=(const UniformScaling& s) { return scale(s.factor()); } - inline Transform operator*(const UniformScaling& s) const + inline TransformTimeDiagonalReturnType operator*(const UniformScaling& s) const { - Transform res = *this; + TransformTimeDiagonalReturnType res = *this; res.scale(s.factor()); return res; }