From 812480baa340f2d8b0bc21b3f2d227168280ad06 Mon Sep 17 00:00:00 2001
From: Rasmus Munk Larsen <rmlarsen@google.com>
Date: Wed, 16 May 2018 09:49:24 -0700
Subject: Rename scalar_clip_op to scalar_clip2_op to prevent collision with
 existing functor in TensorFlow.

---
 unsupported/Eigen/CXX11/src/Tensor/TensorBase.h     | 4 ++--
 unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'unsupported/Eigen/CXX11')

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
index c8dc3bbc5..497e2a797 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
@@ -210,9 +210,9 @@ class TensorBase<Derived, ReadOnlyAccessors>
     }
 
     EIGEN_DEVICE_FUNC
-    EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clip_op<Scalar>, const Derived>
+    EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clip2_op<Scalar>, const Derived>
     clip(Scalar min, Scalar max) const {
-      return unaryExpr(internal::scalar_clip_op<Scalar>(min, max));
+      return unaryExpr(internal::scalar_clip2_op<Scalar>(min, max));
     }
 
     EIGEN_DEVICE_FUNC
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
index 4cee38339..adadb5afc 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
@@ -488,8 +488,8 @@ struct functor_traits<GaussianGenerator<T, Index, NumDims> > {
 };
 
 template <typename Scalar>
-struct scalar_clip_op {
-  EIGEN_DEVICE_FUNC inline scalar_clip_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {}
+struct scalar_clip2_op {
+  EIGEN_DEVICE_FUNC inline scalar_clip2_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {}
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar
   operator()(const Scalar& x) const {
     return numext::mini(numext::maxi(x, m_min), m_max);
@@ -503,7 +503,7 @@ struct scalar_clip_op {
   const Scalar m_max;
 };
 template<typename Scalar>
-struct functor_traits<scalar_clip_op<Scalar> >
+struct functor_traits<scalar_clip2_op<Scalar> >
 { enum { Cost = 2 * NumTraits<Scalar>::AddCost, PacketAccess = (packet_traits<Scalar>::HasMin && packet_traits<Scalar>::HasMax)}; };
 
 } // end namespace internal
-- 
cgit v1.2.3