From: Christopher Dykes <cdykes@fb.com>
Date: Fri, 1 Jul 2016 01:19:27 +0000 (-0700)
Subject: Use uint32_t rather than uint
X-Git-Tag: 2016.07.26~98
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a0de7ae35d848a7e3b9a3c684759601a81f10d7;p=folly.git

Use uint32_t rather than uint

Summary: Because `uint32_t` is standardized, and MSVC doesn't have `uint`.

Reviewed By: yfeldblum

Differential Revision: D3507011

fbshipit-source-id: ac0abb4ad1b2dbaa890554589817ce75abdd987e
---

diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index 71889c40..d06f2e09 100644
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -368,7 +368,7 @@ BENCHMARK(single_thread_posix_trywait, iters) {
   EXPECT_EQ(sem_destroy(&sem), 0);
 }
 
-static void contendedUse(uint n, int posters, int waiters) {
+static void contendedUse(uint32_t n, int posters, int waiters) {
   LifoSemImpl<std::atomic> sem;
 
   std::vector<std::thread> threads;
@@ -377,7 +377,7 @@ static void contendedUse(uint n, int posters, int waiters) {
   BENCHMARK_SUSPEND {
     for (int t = 0; t < waiters; ++t) {
       threads.emplace_back([=,&sem] {
-        for (uint i = t; i < n; i += waiters) {
+        for (uint32_t i = t; i < n; i += waiters) {
           sem.wait();
         }
       });
@@ -387,7 +387,7 @@ static void contendedUse(uint n, int posters, int waiters) {
         while (!go.load()) {
           std::this_thread::yield();
         }
-        for (uint i = t; i < n; i += posters) {
+        for (uint32_t i = t; i < n; i += posters) {
           sem.post();
         }
       });
diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp
index 98df9d09..da567f83 100644
--- a/folly/test/SharedMutexTest.cpp
+++ b/folly/test/SharedMutexTest.cpp
@@ -531,56 +531,56 @@ static void runContendedReaders(size_t numOps,
   }
 }
 
-static void folly_rwspin_reads(uint numOps,
+static void folly_rwspin_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, RWSpinLock, Locker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void shmtx_wr_pri_reads(uint numOps,
+static void shmtx_wr_pri_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, SharedMutexWritePriority, TokenLocker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void shmtx_w_bare_reads(uint numOps,
+static void shmtx_w_bare_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, SharedMutexWritePriority, Locker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void shmtx_rd_pri_reads(uint numOps,
+static void shmtx_rd_pri_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, SharedMutexReadPriority, TokenLocker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void shmtx_r_bare_reads(uint numOps,
+static void shmtx_r_bare_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, SharedMutexReadPriority, Locker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void folly_ticket_reads(uint numOps,
+static void folly_ticket_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, RWTicketSpinLock64, Locker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void boost_shared_reads(uint numOps,
+static void boost_shared_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, boost::shared_mutex, Locker>(
       numOps, numThreads, useSeparateLocks);
 }
 
-static void pthrd_rwlock_reads(uint numOps,
+static void pthrd_rwlock_reads(uint32_t numOps,
                                size_t numThreads,
                                bool useSeparateLocks) {
   runContendedReaders<atomic, PosixRWLock, Locker>(
@@ -649,7 +649,7 @@ static void folly_rwspin(size_t numOps,
       numOps, numThreads, writeFraction, useSeparateLocks);
 }
 
-static void shmtx_wr_pri(uint numOps,
+static void shmtx_wr_pri(uint32_t numOps,
                          size_t numThreads,
                          double writeFraction,
                          bool useSeparateLocks) {
@@ -657,7 +657,7 @@ static void shmtx_wr_pri(uint numOps,
       numOps, numThreads, writeFraction, useSeparateLocks);
 }
 
-static void shmtx_w_bare(uint numOps,
+static void shmtx_w_bare(uint32_t numOps,
                          size_t numThreads,
                          double writeFraction,
                          bool useSeparateLocks) {
@@ -665,7 +665,7 @@ static void shmtx_w_bare(uint numOps,
       numOps, numThreads, writeFraction, useSeparateLocks);
 }
 
-static void shmtx_rd_pri(uint numOps,
+static void shmtx_rd_pri(uint32_t numOps,
                          size_t numThreads,
                          double writeFraction,
                          bool useSeparateLocks) {
@@ -673,7 +673,7 @@ static void shmtx_rd_pri(uint numOps,
       numOps, numThreads, writeFraction, useSeparateLocks);
 }
 
-static void shmtx_r_bare(uint numOps,
+static void shmtx_r_bare(uint32_t numOps,
                          size_t numThreads,
                          double writeFraction,
                          bool useSeparateLocks) {