diff options
Diffstat (limited to 'Eigen/src/Core')
| -rw-r--r-- | Eigen/src/Core/Matrix.h | 8 | ||||
| -rw-r--r-- | Eigen/src/Core/util/ForwardDeclarations.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index 44e4c45b8..cf018ffef 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -364,10 +364,10 @@ class Matrix /////////// Geometry module /////////// - explicit Matrix(const Quaternion<Scalar>& q); - Matrix& operator=(const Quaternion<Scalar>& q); - explicit Matrix(const AngleAxis<Scalar>& aa); - Matrix& operator=(const AngleAxis<Scalar>& aa); + template<typename OtherDerived> + explicit Matrix(const RotationBase<OtherDerived,ColsAtCompileTime>& r); + template<typename OtherDerived> + Matrix& operator=(const RotationBase<OtherDerived,ColsAtCompileTime>& r); }; /** \defgroup matrixtypedefs Global matrix typedefs diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index b85ef94f7..015f4e5b7 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -100,6 +100,7 @@ template<typename MatrixType> class Cholesky; template<typename MatrixType> class CholeskyWithoutSquareRoot; // Geometry module: +template<typename Derived, int _Dim> class RotationBase; template<typename Lhs, typename Rhs> class Cross; template<typename Scalar> class Quaternion; template<typename Scalar> class Rotation2D; |