diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-08-28 08:14:15 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-08-28 08:14:15 -0700 |
commit | 2ab603316af7c1bcf1d5e87d9ba50a2589b36e37 (patch) | |
tree | 11245a1131a272ef6a26105d93d685019a356bb8 /unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h | |
parent | 2ed1495eec9dfca49224b074c12ea6bd024d1400 (diff) |
Use numext::mini/numext::maxi instead of std::min/std::max in the tensor code
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h index 9f8819720..d9061c216 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h @@ -147,7 +147,7 @@ template <typename T> struct MaxReducer } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T finalizeBoth(const T saccum, const Packet& vaccum) const { - return (std::max)(saccum, predux_max(vaccum)); + return numext::maxi(saccum, predux_max(vaccum)); } }; @@ -180,7 +180,7 @@ template <typename T> struct MinReducer } template <typename Packet> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE T finalizeBoth(const T saccum, const Packet& vaccum) const { - return (std::min)(saccum, predux_min(vaccum)); + return numext::mini(saccum, predux_min(vaccum)); } }; |