diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-12 12:52:41 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-12 12:52:41 +0200 |
| commit | f6c18413168c01fca08ae9e0cfeb650b705858f6 (patch) | |
| tree | 953ce6aaefc27d406f71c4568cbdd16c7433b50e /unsupported/Eigen/src/MatrixFunctions | |
| parent | 65c59307e2e5341ce512d17608a2fdf27df9d671 (diff) | |
compilation fixes in unsupported
Diffstat (limited to 'unsupported/Eigen/src/MatrixFunctions')
| -rw-r--r-- | unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/src/MatrixFunctions/MatrixPowerBase.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index b00e5e921..c744fc05f 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -116,7 +116,7 @@ void MatrixLogarithmAtomic<MatrixType>::compute2x2(const MatrixType& A, MatrixTy // computation in previous branch is inaccurate if A(1,1) \approx A(0,0) int unwindingNumber = static_cast<int>(ceil((imag(logA11 - logA00) - M_PI) / (2*M_PI))); Scalar y = A(1,1) - A(0,0), x = A(1,1) + A(0,0); - result(0,1) = A(0,1) * (Scalar(2) * internal::atanh2(y,x) + Scalar(0,2*M_PI*unwindingNumber)) / y; + result(0,1) = A(0,1) * (Scalar(2) * numext::atanh2(y,x) + Scalar(0,2*M_PI*unwindingNumber)) / y; } } diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixPowerBase.h b/unsupported/Eigen/src/MatrixFunctions/MatrixPowerBase.h index 636df5363..5e43b285b 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixPowerBase.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixPowerBase.h @@ -183,14 +183,14 @@ template<typename Scalar, int IsComplex = NumTraits<Scalar>::IsComplex> struct matrix_power_unwinder { static inline Scalar run(const Scalar& eival, const Scalar& eival0, int unwindingNumber) - { return internal::atanh2(eival-eival0, eival+eival0) + Scalar(0, M_PI*unwindingNumber); } + { return numext::atanh2(eival-eival0, eival+eival0) + Scalar(0, M_PI*unwindingNumber); } }; template<typename Scalar> struct matrix_power_unwinder<Scalar,0> { static inline Scalar run(Scalar eival, Scalar eival0, int) - { return internal::atanh2(eival-eival0, eival+eival0); } + { return numext::atanh2(eival-eival0, eival+eival0); } }; template<typename T> |