Remove uses of type `uint` since it is not defined on all platforms.

Switch to `uint32` or `int`, depending on context.
Change: 133151643

5 files changed, 7 insertions, 7 deletions

diff --git a/tensorflow/core/lib/io/snappy/snappy_buffers_test.cc b/tensorflow/core/lib/io/snappy/snappy_buffers_test.cc
index 65bb34d570..8ebe150859 100644
--- a/tensorflow/core/lib/io/snappy/snappy_buffers_test.cc
+++ b/tensorflow/core/lib/io/snappy/snappy_buffers_test.cc
@@ -42,7 +42,7 @@ static string GetRecord() {
   return lorem_ipsum;
 }
 
-static string GenTestString(uint copies = 1) {
+static string GenTestString(int copies = 1) {
   string result = "";
   for (int i = 0; i < copies; i++) {
     result += GetRecord();
diff --git a/tensorflow/core/lib/io/zlib_buffers_test.cc b/tensorflow/core/lib/io/zlib_buffers_test.cc
index 1290e98ce2..f4b08f4200 100644
--- a/tensorflow/core/lib/io/zlib_buffers_test.cc
+++ b/tensorflow/core/lib/io/zlib_buffers_test.cc
@@ -48,7 +48,7 @@ static string GetRecord() {
   return lorem_ipsum;
 }
 
-static string GenTestString(uint copies = 1) {
+static string GenTestString(int copies = 1) {
   string result = "";
   for (int i = 0; i < copies; i++) {
     result += GetRecord();
diff --git a/tensorflow/core/lib/io/zlib_outputbuffer.cc b/tensorflow/core/lib/io/zlib_outputbuffer.cc
index 86e0521fdc..cc2d941a64 100644
--- a/tensorflow/core/lib/io/zlib_outputbuffer.cc
+++ b/tensorflow/core/lib/io/zlib_outputbuffer.cc
@@ -130,7 +130,7 @@ Status ZlibOutputBuffer::DeflateBuffered(bool last) {
 }
 
 Status ZlibOutputBuffer::FlushOutputBufferToFile() {
-  uint bytes_to_write = output_buffer_capacity_ - z_stream_->avail_out;
+  uint32 bytes_to_write = output_buffer_capacity_ - z_stream_->avail_out;
   if (bytes_to_write > 0) {
     Status s = file_->Append(StringPiece(
         reinterpret_cast<char*>(z_stream_output_.get()), bytes_to_write));
diff --git a/tensorflow/core/lib/png/png_io.cc b/tensorflow/core/lib/png/png_io.cc
index cbee7a416e..bdc39e5d6f 100644
--- a/tensorflow/core/lib/png/png_io.cc
+++ b/tensorflow/core/lib/png/png_io.cc
@@ -64,7 +64,7 @@ static void Convert8to16(const uint8* p8, int num_comps, int p8_row_bytes,
   for (; height-- != 0;
        CPTR_INC(uint8, p8, bump8), PTR_INC(uint16, p16, bump16)) {
     for (int w = width; w-- != 0; --p8, --p16) {
-      uint pix = *p8;
+      uint32 pix = *p8;
       pix |= pix << 8;
       *p16 = static_cast<uint16>(pix);
     }
diff --git a/tensorflow/core/util/example_proto_fast_parsing.cc b/tensorflow/core/util/example_proto_fast_parsing.cc
index a8b91859ad..e037a00b98 100644
--- a/tensorflow/core/util/example_proto_fast_parsing.cc
+++ b/tensorflow/core/util/example_proto_fast_parsing.cc
@@ -55,9 +55,9 @@ uint8 PeekTag(protobuf::io::CodedInputStream* stream) {
   return *static_cast<const uint8*>(ptr);
 }
 
-constexpr uint8 kVarintTag(uint tag) { return (tag << 3) | 0; }
-constexpr uint8 kDelimitedTag(uint tag) { return (tag << 3) | 2; }
-constexpr uint8 kFixed32Tag(uint tag) { return (tag << 3) | 5; }
+constexpr uint8 kVarintTag(uint32 tag) { return (tag << 3) | 0; }
+constexpr uint8 kDelimitedTag(uint32 tag) { return (tag << 3) | 2; }
+constexpr uint8 kFixed32Tag(uint32 tag) { return (tag << 3) | 5; }
 
 namespace parsed {