diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-07-29 16:33:07 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-07-29 16:33:07 +0000 |
commit | 842c4f8bfa51008ab13919225f95b56e6cbcc655 (patch) | |
tree | 777584717ed1737ab1527c36d5392d1016f1d2c9 /Eigen/src/Geometry/OrthoMethods.h | |
parent | e0215ee5101ad0d656509902bdb46ab61551865e (diff) |
Several compilation fixes for MSVC and NVCC, basically:
- added explicit enum to int conversion where needed
- if a function is not defined as declared and the return type is "tricky"
then the type must be typedefined somewhere. A "tricky return type" can be:
* a template class with a default parameter which depends on another template parameter
* a nested template class, or type of a nested template class
Diffstat (limited to 'Eigen/src/Geometry/OrthoMethods.h')
-rw-r--r-- | Eigen/src/Geometry/OrthoMethods.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/OrthoMethods.h b/Eigen/src/Geometry/OrthoMethods.h index ea71c12d2..b6206f7b2 100644 --- a/Eigen/src/Geometry/OrthoMethods.h +++ b/Eigen/src/Geometry/OrthoMethods.h @@ -30,7 +30,7 @@ * \returns the cross product of \c *this and \a other */ template<typename Derived> template<typename OtherDerived> -inline typename ei_eval<Derived>::type +inline typename MatrixBase<Derived>::EvalType MatrixBase<Derived>::cross(const MatrixBase<OtherDerived>& other) const { EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(Derived,3); @@ -100,7 +100,7 @@ struct ei_perpendicular_selector<Derived,2> * \sa cross() */ template<typename Derived> -typename ei_eval<Derived>::type +typename MatrixBase<Derived>::EvalType MatrixBase<Derived>::someOrthogonal() const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived); |