From 7aad4341609260356845b16057fd581302c5072f Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 4 Dec 2009 12:26:56 +0100 Subject: [PATCH] fix compilation and clean a bit Map --- Eigen/src/Geometry/Quaternion.h | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index a6bdb2408..7f102c942 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -152,9 +152,9 @@ public: /** \returns the conjugated quaternion */ Quaternion conjugate() const; - /** \returns an interpolation for a constant motion between \a other and \c *this + /** \returns an interpolation for a constant motion between \a other and \c *this * \a t in [0;1] - * see http://en.wikipedia.org/wiki/Slerp + * see http://en.wikipedia.org/wiki/Slerp */ template Quaternion slerp(Scalar t, const QuaternionBase& other) const; @@ -221,7 +221,7 @@ struct ei_traits > template class Quaternion : public QuaternionBase >{ typedef QuaternionBase > Base; -public: +public: typedef _Scalar Scalar; EIGEN_INHERIT_ASSIGNMENT_EQUAL_OPERATOR(Quaternion) @@ -304,20 +304,13 @@ template class Map, PacketAccess > : public QuaternionBase, PacketAccess> > { - public: - typedef _Scalar Scalar; - typedef Map, PacketAccess > MapQuat; - - private: - Map, PacketAccess >(); - Map, PacketAccess >(const Map, PacketAccess>&); - typedef QuaternionBase, PacketAccess> > Base; - public: - EIGEN_INHERIT_ASSIGNMENT_EQUAL_OPERATOR(MapQuat) - using Base::operator*=; - typedef typename ei_traits, PacketAccess> >::Coefficients Coefficients; + public: + typedef _Scalar Scalar; + typedef typename ei_traits::Coefficients Coefficients; + EIGEN_INHERIT_ASSIGNMENT_EQUAL_OPERATOR(Map) + using Base::operator*=; /** Constructs a Mapped Quaternion object from the pointer \a coeffs *