Rename scalar_clip_op to scalar_clip2_op to prevent collision with existing functor in TensorFlow.

This commit is contained in:
Rasmus Munk Larsen
2018-05-16 09:49:24 -07:00
parent afec3021f7
commit 812480baa3
2 changed files with 5 additions and 5 deletions

View File

@@ -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