Commit 9f80fe26 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook Github Bot

Fix some violations of -Werror=shadow=compatible-local under gcc8

Summary: Pull Request resolved: https://github.com/facebook/folly/pull/979

Reviewed By: Orvid

Differential Revision: D13368681

Pulled By: yfeldblum

fbshipit-source-id: 56c18633ddd029ee499940ce5c8b8ad2cbef4ea7
parent b4372011
...@@ -73,8 +73,8 @@ static void run(RWSpinLockType* lock) { ...@@ -73,8 +73,8 @@ static void run(RWSpinLockType* lock) {
} }
TYPED_TEST(RWSpinLockTest, Writer_Wait_Readers) { TYPED_TEST(RWSpinLockTest, Writer_Wait_Readers) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
for (int i = 0; i < kMaxReaders; ++i) { for (int i = 0; i < kMaxReaders; ++i) {
EXPECT_TRUE(l.try_lock_shared()); EXPECT_TRUE(l.try_lock_shared());
...@@ -90,8 +90,8 @@ TYPED_TEST(RWSpinLockTest, Writer_Wait_Readers) { ...@@ -90,8 +90,8 @@ TYPED_TEST(RWSpinLockTest, Writer_Wait_Readers) {
} }
TYPED_TEST(RWSpinLockTest, Readers_Wait_Writer) { TYPED_TEST(RWSpinLockTest, Readers_Wait_Writer) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
EXPECT_TRUE(l.try_lock()); EXPECT_TRUE(l.try_lock());
...@@ -106,8 +106,8 @@ TYPED_TEST(RWSpinLockTest, Readers_Wait_Writer) { ...@@ -106,8 +106,8 @@ TYPED_TEST(RWSpinLockTest, Readers_Wait_Writer) {
} }
TYPED_TEST(RWSpinLockTest, Writer_Wait_Writer) { TYPED_TEST(RWSpinLockTest, Writer_Wait_Writer) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
EXPECT_TRUE(l.try_lock()); EXPECT_TRUE(l.try_lock());
EXPECT_FALSE(l.try_lock()); EXPECT_FALSE(l.try_lock());
...@@ -118,11 +118,11 @@ TYPED_TEST(RWSpinLockTest, Writer_Wait_Writer) { ...@@ -118,11 +118,11 @@ TYPED_TEST(RWSpinLockTest, Writer_Wait_Writer) {
} }
TYPED_TEST(RWSpinLockTest, Read_Holders) { TYPED_TEST(RWSpinLockTest, Read_Holders) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
{ {
typename RWSpinLockType::ReadHolder guard(&l); typename LockType::ReadHolder guard(&l);
EXPECT_FALSE(l.try_lock()); EXPECT_FALSE(l.try_lock());
EXPECT_TRUE(l.try_lock_shared()); EXPECT_TRUE(l.try_lock_shared());
l.unlock_shared(); l.unlock_shared();
...@@ -135,10 +135,10 @@ TYPED_TEST(RWSpinLockTest, Read_Holders) { ...@@ -135,10 +135,10 @@ TYPED_TEST(RWSpinLockTest, Read_Holders) {
} }
TYPED_TEST(RWSpinLockTest, Write_Holders) { TYPED_TEST(RWSpinLockTest, Write_Holders) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
{ {
typename RWSpinLockType::WriteHolder guard(&l); typename LockType::WriteHolder guard(&l);
EXPECT_FALSE(l.try_lock()); EXPECT_FALSE(l.try_lock());
EXPECT_FALSE(l.try_lock_shared()); EXPECT_FALSE(l.try_lock_shared());
} }
...@@ -150,13 +150,13 @@ TYPED_TEST(RWSpinLockTest, Write_Holders) { ...@@ -150,13 +150,13 @@ TYPED_TEST(RWSpinLockTest, Write_Holders) {
} }
TYPED_TEST(RWSpinLockTest, ConcurrentTests) { TYPED_TEST(RWSpinLockTest, ConcurrentTests) {
typedef typename TestFixture::RWSpinLockType RWSpinLockType; typedef typename TestFixture::RWSpinLockType LockType;
RWSpinLockType l; LockType l;
srand(time(nullptr)); srand(time(nullptr));
std::vector<std::thread> threads; std::vector<std::thread> threads;
for (int i = 0; i < FLAGS_num_threads; ++i) { for (int i = 0; i < FLAGS_num_threads; ++i) {
threads.push_back(std::thread(&run<RWSpinLockType>, &l)); threads.push_back(std::thread(&run<LockType>, &l));
} }
sleep(1); sleep(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment