Use suffixed {uint,int}{8,16,32,64}_t types.

talk/media/base/streamparams_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 11 matching lines @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "talk/media/base/streamparams.h"
 #include "talk/media/base/testutils.h"
 #include "webrtc/base/gunit.h"
 
-static const uint32 kSsrcs1[] = {1};
-static const uint32 kSsrcs2[] = {1, 2};
-static const uint32 kSsrcs3[] = {1, 2, 3};
-static const uint32 kRtxSsrcs3[] = {4, 5, 6};
+static const uint32_t kSsrcs1[] = {1};
+static const uint32_t kSsrcs2[] = {1, 2};
+static const uint32_t kSsrcs3[] = {1, 2, 3};
+static const uint32_t kRtxSsrcs3[] = {4, 5, 6};
 
 static cricket::StreamParams CreateStreamParamsWithSsrcGroup(
-    const std::string& semantics, const uint32 ssrcs_in[], size_t len) {
+    const std::string& semantics,
+    const uint32_t ssrcs_in[],
+    size_t len) {
   cricket::StreamParams stream;
-  std::vector<uint32> ssrcs(ssrcs_in, ssrcs_in + len);
+  std::vector<uint32_t> ssrcs(ssrcs_in, ssrcs_in + len);
   cricket::SsrcGroup sg(semantics, ssrcs);
   stream.ssrcs = ssrcs;
   stream.ssrc_groups.push_back(sg);
   return stream;
 }
 
 TEST(SsrcGroup, EqualNotEqual) {
   cricket::SsrcGroup ssrc_groups[] = {
     cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs1)),
     cricket::SsrcGroup("ABC", MAKE_VECTOR(kSsrcs2)),
@@ skipping 19 matching lines @@
   cricket::SsrcGroup sg3("abc", MAKE_VECTOR(kSsrcs1));
   EXPECT_FALSE(sg3.has_semantics("ABC"));
 }
 
 TEST(SsrcGroup, ToString) {
   cricket::SsrcGroup sg1("ABC", MAKE_VECTOR(kSsrcs1));
   EXPECT_STREQ("{semantics:ABC;ssrcs:[1]}", sg1.ToString().c_str());
 }
 
 TEST(StreamParams, CreateLegacy) {
-  const uint32 ssrc = 7;
+  const uint32_t ssrc = 7;
   cricket::StreamParams one_sp = cricket::StreamParams::CreateLegacy(ssrc);
   EXPECT_EQ(1U, one_sp.ssrcs.size());
   EXPECT_EQ(ssrc, one_sp.first_ssrc());
   EXPECT_TRUE(one_sp.has_ssrcs());
   EXPECT_TRUE(one_sp.has_ssrc(ssrc));
   EXPECT_FALSE(one_sp.has_ssrc(ssrc+1));
   EXPECT_FALSE(one_sp.has_ssrc_groups());
   EXPECT_EQ(0U, one_sp.ssrc_groups.size());
 }
 
@@ skipping 34 matching lines @@
 
   for (size_t i = 0; i < ARRAY_SIZE(sps); ++i) {
     for (size_t j = 0; j < ARRAY_SIZE(sps); ++j) {
       EXPECT_EQ((sps[i] == sps[j]), (i == j));
       EXPECT_EQ((sps[i] != sps[j]), (i != j));
     }
   }
 }
 
 TEST(StreamParams, FidFunctions) {
-  uint32 fid_ssrc;
+  uint32_t fid_ssrc;
 
   cricket::StreamParams sp = cricket::StreamParams::CreateLegacy(1);
   EXPECT_FALSE(sp.AddFidSsrc(10, 20));
   EXPECT_TRUE(sp.AddFidSsrc(1, 2));
   EXPECT_TRUE(sp.GetFidSsrc(1, &fid_ssrc));
   EXPECT_EQ(2u, fid_ssrc);
   EXPECT_FALSE(sp.GetFidSsrc(15, &fid_ssrc));
 
   sp.add_ssrc(20);
   sp.AddFidSsrc(20, 30);
   EXPECT_TRUE(sp.GetFidSsrc(20, &fid_ssrc));
   EXPECT_EQ(30u, fid_ssrc);
 
   // Manually create SsrcGroup to test bounds-checking
   // in GetSecondarySsrc. We construct an invalid StreamParams
   // for this.
-  std::vector<uint32> fid_vector;
+  std::vector<uint32_t> fid_vector;
   fid_vector.push_back(13);
   cricket::SsrcGroup invalid_fid_group(cricket::kFidSsrcGroupSemantics,
                                         fid_vector);
   cricket::StreamParams sp_invalid;
   sp_invalid.add_ssrc(13);
   sp_invalid.ssrc_groups.push_back(invalid_fid_group);
   EXPECT_FALSE(sp_invalid.GetFidSsrc(13, &fid_ssrc));
 }
 
 TEST(StreamParams, GetPrimaryAndFidSsrcs) {
   cricket::StreamParams sp;
   sp.ssrcs.push_back(1);
   sp.ssrcs.push_back(2);
   sp.ssrcs.push_back(3);
 
-  std::vector<uint32> primary_ssrcs;
+  std::vector<uint32_t> primary_ssrcs;
   sp.GetPrimarySsrcs(&primary_ssrcs);
-  std::vector<uint32> fid_ssrcs;
+  std::vector<uint32_t> fid_ssrcs;
   sp.GetFidSsrcs(primary_ssrcs, &fid_ssrcs);
   ASSERT_EQ(1u, primary_ssrcs.size());
   EXPECT_EQ(1u, primary_ssrcs[0]);
   ASSERT_EQ(0u, fid_ssrcs.size());
 
   sp.ssrc_groups.push_back(
       cricket::SsrcGroup(cricket::kSimSsrcGroupSemantics, sp.ssrcs));
   sp.AddFidSsrc(1, 10);
   sp.AddFidSsrc(2, 20);
 
@@ skipping 84 matching lines @@
   // stream2 has invalid fid-group (no primary).
   cricket::StreamParams stream2;
   stream2.add_ssrc(13);
   EXPECT_TRUE(stream2.AddFidSsrc(13, 14));
   std::remove(stream2.ssrcs.begin(), stream2.ssrcs.end(), 13);
   EXPECT_FALSE(cricket::IsSimulcastStream(stream2));
 
   // stream3 has two SIM groups.
   cricket::StreamParams stream3 =
       cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs2));
-  std::vector<uint32> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3);
+  std::vector<uint32_t> sim_ssrcs = MAKE_VECTOR(kRtxSsrcs3);
   cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, sim_ssrcs);
   for (size_t i = 0; i < sim_ssrcs.size(); i++) {
     stream3.add_ssrc(sim_ssrcs[i]);
   }
   stream3.ssrc_groups.push_back(sg);
   EXPECT_FALSE(cricket::IsSimulcastStream(stream3));
 }