Switch to standard integer types in courgette/.

courgette/streams_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/streams.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(StreamsTest, SimpleWriteRead) {
   const unsigned int kValue1 = 12345;
   courgette::SinkStream sink;
 
   EXPECT_TRUE(sink.WriteVarint32(kValue1));
 
-  const uint8* sink_buffer = sink.Buffer();
+  const uint8_t* sink_buffer = sink.Buffer();
   size_t length = sink.Length();
 
   courgette::SourceStream source;
   source.Init(sink_buffer, length);
 
   unsigned int value;
   bool can_read = source.ReadVarint32(&value);
   EXPECT_TRUE(can_read);
   EXPECT_EQ(kValue1, value);
   EXPECT_EQ(0U, source.Remaining());
 }
 
 TEST(StreamsTest, SimpleWriteRead2) {
   courgette::SinkStream sink;
 
   EXPECT_TRUE(sink.Write("Hello", 5));
 
-  const uint8* sink_buffer = sink.Buffer();
+  const uint8_t* sink_buffer = sink.Buffer();
   size_t sink_length = sink.Length();
 
   courgette::SourceStream source;
   source.Init(sink_buffer, sink_length);
 
   char text[10] = {0};
   bool can_read = source.Read(text, 5);
   EXPECT_TRUE(can_read);
   EXPECT_EQ(0, memcmp("Hello", text, 5));
   EXPECT_EQ(0U, source.Remaining());
 }
 
 TEST(StreamsTest, StreamSetWriteRead) {
   courgette::SinkStreamSet out;
   out.Init(4);
 
   const unsigned int kValue1 = 12345;
 
   EXPECT_TRUE(out.stream(3)->WriteVarint32(kValue1));
 
   courgette::SinkStream collected;
 
   EXPECT_TRUE(out.CopyTo(&collected));
 
-  const uint8* collected_buffer = collected.Buffer();
+  const uint8_t* collected_buffer = collected.Buffer();
   size_t collected_length = collected.Length();
 
   courgette::SourceStreamSet in;
   bool can_init = in.Init(collected_buffer, collected_length);
   EXPECT_TRUE(can_init);
 
-  uint32 value;
+  uint32_t value;
   bool can_read = in.stream(3)->ReadVarint32(&value);
   EXPECT_TRUE(can_read);
   EXPECT_EQ(kValue1, value);
   EXPECT_EQ(0U, in.stream(3)->Remaining());
   EXPECT_EQ(0U, in.stream(2)->Remaining());
 }
 
 TEST(StreamsTest, StreamSetWriteRead2) {
   const size_t kNumberOfStreams = 4;
   const unsigned int kEnd = ~0U;
@@ skipping 19 matching lines @@
 
   EXPECT_TRUE(out.CopyTo(&collected));
 
   courgette::SourceStreamSet in;
   bool can_init = in.Init(collected.Buffer(), collected.Length());
   EXPECT_TRUE(can_init);
 
   for (size_t i = 0;  data[i] != kEnd;  i += 2) {
     size_t id = data[i];
     size_t datum = data[i + 1];
-    uint32 value = 77;
+    uint32_t value = 77;
     bool can_read = in.stream(id)->ReadVarint32(&value);
     EXPECT_TRUE(can_read);
     EXPECT_EQ(datum, value);
   }
 
   for (size_t i = 0;  i < kNumberOfStreams;  ++i) {
     EXPECT_EQ(0U, in.stream(i)->Remaining());
   }
 }
 
 TEST(StreamsTest, SignedVarint32) {
   courgette::SinkStream out;
 
-  static const int32 data[] = {
-    0, 64, 128, 8192, 16384,
-    1 << 20, 1 << 21, 1 << 22,
-    1 << 27, 1 << 28,
-    0x7fffffff, -0x7fffffff
-  };
+  static const int32_t data[] = {0,       64,      128,        8192,
+                                 16384,   1 << 20, 1 << 21,    1 << 22,
+                                 1 << 27, 1 << 28, 0x7fffffff, -0x7fffffff};
 
-  std::vector<int32> values;
+  std::vector<int32_t> values;
   for (size_t i = 0;  i < sizeof(data)/sizeof(data[0]);  ++i) {
-    int32 basis = data[i];
+    int32_t basis = data[i];
     for (int delta = -4; delta <= 4; ++delta) {
       EXPECT_TRUE(out.WriteVarint32Signed(basis + delta));
       values.push_back(basis + delta);
       EXPECT_TRUE(out.WriteVarint32Signed(-basis + delta));
       values.push_back(-basis + delta);
     }
   }
 
   courgette::SourceStream in;
   in.Init(out);
 
   for (size_t i = 0;  i < values.size();  ++i) {
     int written_value = values[i];
-    int32 datum;
+    int32_t datum;
     bool can_read = in.ReadVarint32Signed(&datum);
     EXPECT_TRUE(can_read);
     EXPECT_EQ(written_value, datum);
   }
 
   EXPECT_TRUE(in.Empty());
 }
 
 TEST(StreamsTest, StreamSetReadWrite) {
   courgette::SinkStreamSet out;
@@ skipping 26 matching lines @@
   EXPECT_TRUE(can_read_2);
   EXPECT_TRUE(in.Empty());
 
   courgette::SourceStreamSet subset3;
   bool can_read_3 = in.ReadSet(&subset3);
   EXPECT_FALSE(can_read_3);
 
   EXPECT_FALSE(subset1.Empty());
   EXPECT_FALSE(subset1.Empty());
 
-  uint32 datum;
+  uint32_t datum;
   EXPECT_TRUE(subset1.stream(3)->ReadVarint32(&datum));
   EXPECT_EQ(30000U, datum);
   EXPECT_TRUE(subset1.stream(5)->ReadVarint32(&datum));
   EXPECT_EQ(50000U, datum);
   EXPECT_TRUE(subset1.Empty());
 
   EXPECT_TRUE(subset2.stream(2)->ReadVarint32(&datum));
   EXPECT_EQ(20000U, datum);
   EXPECT_TRUE(subset2.stream(6)->ReadVarint32(&datum));
   EXPECT_EQ(60000U, datum);
   EXPECT_TRUE(subset2.Empty());
 }