diff options
| author |  Nathan Luehr <nluehr@nvidia.com> | 2021-04-16 14:04:20 -0500 |
|---|---|---|
| committer | Nathan Luehr <nluehr@nvidia.com> | 2021-05-11 15:41:11 -0500 |
| commit | 6753f0f197e7b8a8019e82e7b144ac0281d6a7f1 (patch) | |
| tree | 680e98ceaa864a13d71e0a2f59f199d096428e07 /Eigen | |
| parent | 3d9051ea84a5089b277c88dac456b3b1576bfa7f (diff) | |
Fix ambiguity due to argument dependent lookup.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/functors/UnaryFunctors.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h index c98fa573c..16136d185 100644 --- a/Eigen/src/Core/functors/UnaryFunctors.h +++ b/Eigen/src/Core/functors/UnaryFunctors.h @@ -109,7 +109,7 @@ struct functor_traits<scalar_abs2_op<Scalar> > template<typename Scalar> struct scalar_conjugate_op { EIGEN_EMPTY_STRUCT_CTOR(scalar_conjugate_op) EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE const Scalar operator() (const Scalar& a) const { using numext::conj; return conj(a); } + EIGEN_STRONG_INLINE const Scalar operator() (const Scalar& a) const { return numext::conj(a); } template<typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Packet packetOp(const Packet& a) const { return internal::pconj(a); } }; @@ -138,7 +138,7 @@ struct functor_traits<scalar_conjugate_op<Scalar> > template<typename Scalar> struct scalar_arg_op { EIGEN_EMPTY_STRUCT_CTOR(scalar_arg_op) typedef typename NumTraits<Scalar>::Real result_type; - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const result_type operator() (const Scalar& a) const { using numext::arg; return arg(a); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const result_type operator() (const Scalar& a) const { return numext::arg(a); } template<typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Packet packetOp(const Packet& a) const { return internal::parg(a); } |