diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-01-31 12:58:52 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-01-31 12:58:52 +0100 |
| commit | 9c86ee26952cde01f91baa310e78b582483463c9 (patch) | |
| tree | 17b5dbc18a030280470ce28404ae88aa459d3dc0 /Eigen/src/Eigen2Support | |
| parent | 8d6e394b060c7a531737e32902e2048915cb30ae (diff) | |
fix static inline versus inline static issues (the former is the correct order)
Diffstat (limited to 'Eigen/src/Eigen2Support')
| -rw-r--r-- | Eigen/src/Eigen2Support/Geometry/Quaternion.h | 6 | ||||
| -rw-r--r-- | Eigen/src/Eigen2Support/Geometry/RotationBase.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Eigen2Support/Geometry/Quaternion.h b/Eigen/src/Eigen2Support/Geometry/Quaternion.h index bb6326416..593dc6d97 100644 --- a/Eigen/src/Eigen2Support/Geometry/Quaternion.h +++ b/Eigen/src/Eigen2Support/Geometry/Quaternion.h @@ -143,7 +143,7 @@ public: /** \returns a quaternion representing an identity rotation * \sa MatrixBase::Identity() */ - inline static Quaternion Identity() { return Quaternion(1, 0, 0, 0); } + static inline Quaternion Identity() { return Quaternion(1, 0, 0, 0); } /** \sa Quaternion::Identity(), MatrixBase::setIdentity() */ @@ -460,7 +460,7 @@ template<typename Other> struct ei_quaternion_assign_impl<Other,3,3> { typedef typename Other::Scalar Scalar; - inline static void run(Quaternion<Scalar>& q, const Other& mat) + static inline void run(Quaternion<Scalar>& q, const Other& mat) { // This algorithm comes from "Quaternion Calculus and Fast Animation", // Ken Shoemake, 1987 SIGGRAPH course notes @@ -499,7 +499,7 @@ template<typename Other> struct ei_quaternion_assign_impl<Other,4,1> { typedef typename Other::Scalar Scalar; - inline static void run(Quaternion<Scalar>& q, const Other& vec) + static inline void run(Quaternion<Scalar>& q, const Other& vec) { q.coeffs() = vec; } diff --git a/Eigen/src/Eigen2Support/Geometry/RotationBase.h b/Eigen/src/Eigen2Support/Geometry/RotationBase.h index 2f494f198..60ca063ea 100644 --- a/Eigen/src/Eigen2Support/Geometry/RotationBase.h +++ b/Eigen/src/Eigen2Support/Geometry/RotationBase.h @@ -113,20 +113,20 @@ Matrix<_Scalar, _Rows, _Cols, _Storage, _MaxRows, _MaxCols> * \sa class Transform, class Rotation2D, class Quaternion, class AngleAxis */ template<typename Scalar, int Dim> -inline static Matrix<Scalar,2,2> ei_toRotationMatrix(const Scalar& s) +static inline Matrix<Scalar,2,2> ei_toRotationMatrix(const Scalar& s) { EIGEN_STATIC_ASSERT(Dim==2,YOU_MADE_A_PROGRAMMING_MISTAKE) return Rotation2D<Scalar>(s).toRotationMatrix(); } template<typename Scalar, int Dim, typename OtherDerived> -inline static Matrix<Scalar,Dim,Dim> ei_toRotationMatrix(const RotationBase<OtherDerived,Dim>& r) +static inline Matrix<Scalar,Dim,Dim> ei_toRotationMatrix(const RotationBase<OtherDerived,Dim>& r) { return r.toRotationMatrix(); } template<typename Scalar, int Dim, typename OtherDerived> -inline static const MatrixBase<OtherDerived>& ei_toRotationMatrix(const MatrixBase<OtherDerived>& mat) +static inline const MatrixBase<OtherDerived>& ei_toRotationMatrix(const MatrixBase<OtherDerived>& mat) { EIGEN_STATIC_ASSERT(OtherDerived::RowsAtCompileTime==Dim && OtherDerived::ColsAtCompileTime==Dim, YOU_MADE_A_PROGRAMMING_MISTAKE) |