diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-04-05 16:35:49 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-04-05 16:35:49 +0200 |
| commit | 12439e12490b9fd79fe18aa30ce09648dcb644ba (patch) | |
| tree | 4ba34589aa6fa04dd141e0374039165e62a9a3ac /Eigen/src/Geometry/AngleAxis.h | |
| parent | d93c1c113b9540e7a66d4b2c2dc3c1e99b5d26a1 (diff) | |
Port SelfCwiseBinaryOp and Dot.h to nvcc, fix portability issue with std::min/max
Diffstat (limited to 'Eigen/src/Geometry/AngleAxis.h')
| -rw-r--r-- | Eigen/src/Geometry/AngleAxis.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/AngleAxis.h b/Eigen/src/Geometry/AngleAxis.h index 553d38c74..f424e6d7d 100644 --- a/Eigen/src/Geometry/AngleAxis.h +++ b/Eigen/src/Geometry/AngleAxis.h @@ -159,8 +159,8 @@ template<typename QuatDerived> AngleAxis<Scalar>& AngleAxis<Scalar>::operator=(const QuaternionBase<QuatDerived>& q) { using std::acos; - using std::min; - using std::max; + EIGEN_USING_STD_MATH(min); + EIGEN_USING_STD_MATH(max); using std::sqrt; Scalar n2 = q.vec().squaredNorm(); if (n2 < NumTraits<Scalar>::dummy_precision()*NumTraits<Scalar>::dummy_precision()) |