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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBase.h')

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
-- 
cgit v1.2.3