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/Quaternion.h | |
| parent | d93c1c113b9540e7a66d4b2c2dc3c1e99b5d26a1 (diff) | |
Port SelfCwiseBinaryOp and Dot.h to nvcc, fix portability issue with std::min/max
Diffstat (limited to 'Eigen/src/Geometry/Quaternion.h')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index e7801abf9..45824fbeb 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -572,7 +572,7 @@ template<class Derived> template<typename Derived1, typename Derived2> inline Derived& QuaternionBase<Derived>::setFromTwoVectors(const MatrixBase<Derived1>& a, const MatrixBase<Derived2>& b) { - using std::max; + EIGEN_USING_STD_MATH(max); using std::sqrt; Vector3 v0 = a.normalized(); Vector3 v1 = b.normalized(); |