diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
| commit | fe57b2f963da832d14f4d7b6d4a9554ceef26e36 (patch) | |
| tree | ed0e5d13ae6dde3f98d012ad3f87570b77e8230d /Eigen/src/Geometry/Quaternion.h | |
| parent | c12b7896d0ddf95e8f060c93a5cf2fcfa1e6865c (diff) | |
bug #701: workaround (min) and (max) blocking ADL by introducing numext::mini and numext::maxi internal functions and a EIGEN_NOT_A_MACRO macro.
Diffstat (limited to 'Eigen/src/Geometry/Quaternion.h')
| -rw-r--r-- | Eigen/src/Geometry/Quaternion.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 216e5b12f..508eba767 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -571,7 +571,6 @@ template<class Derived> template<typename Derived1, typename Derived2> inline Derived& QuaternionBase<Derived>::setFromTwoVectors(const MatrixBase<Derived1>& a, const MatrixBase<Derived2>& b) { - EIGEN_USING_STD_MATH(max); using std::sqrt; Vector3 v0 = a.normalized(); Vector3 v1 = b.normalized(); @@ -587,7 +586,7 @@ inline Derived& QuaternionBase<Derived>::setFromTwoVectors(const MatrixBase<Deri // which yields a singular value problem if (c < Scalar(-1)+NumTraits<Scalar>::dummy_precision()) { - c = (max)(c,Scalar(-1)); + c = numext::maxi(c,Scalar(-1)); Matrix<Scalar,2,3> m; m << v0.transpose(), v1.transpose(); JacobiSVD<Matrix<Scalar,2,3> > svd(m, ComputeFullV); Vector3 axis = svd.matrixV().col(2); |