Fix various warnings exposed by current versions of Clang.

Change: 136975423

1 files changed, 10 insertions, 1 deletions

diff --git a/tensorflow/core/kernels/cwise_ops.h b/tensorflow/core/kernels/cwise_ops.h
index 5d15cf0048..2a77376a42 100644
--- a/tensorflow/core/kernels/cwise_ops.h
+++ b/tensorflow/core/kernels/cwise_ops.h
@@ -237,7 +237,7 @@ struct functor_traits<scalar_compose_op<Scalar, UnaryFunctor, BinaryFunctor>> {
 };
 
 // TODO(b/32239616): This kernel should be moved into Eigen and vectorized.
-template <typename T>
+template <typename T, typename Enable = void>
 struct google_floor_div {
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const T operator()(const T& x,
                                                            const T& y) const {
@@ -251,6 +251,15 @@ struct google_floor_div {
   }
 };
 
+template <typename T>
+struct google_floor_div<
+    T, typename std::enable_if<std::is_unsigned<T>::value>::type> {
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const T operator()(const T& x,
+                                                           const T& y) const {
+    return x / y;
+  }
+};
+
 template <typename Scalar>
 struct functor_traits<google_floor_div<Scalar>> {
   enum {