Commit db2cedc7 authored by Dan Melnic's avatar Dan Melnic Committed by Facebook Github Bot

Fix "declaration of 'h' shadows a previous local [-Werror=shadow-compatible-local]"

Summary:
Fix "declaration of 'h' shadows a previous local [-Werror=shadow-compatible-local]"

(Note: this ignores all push blocking failures!)

Reviewed By: djwatson

Differential Revision: D7406485

fbshipit-source-id: f23548022a3ccb1f480c7265b11c31d2e2876fd4
parent 8c80ad9e
...@@ -412,7 +412,6 @@ TEST(F14FastMap, simple) { ...@@ -412,7 +412,6 @@ TEST(F14FastMap, simple) {
TEST(F14VectorMap, reverse_iterator) { TEST(F14VectorMap, reverse_iterator) {
using TMap = F14VectorMap<uint64_t, uint64_t>; using TMap = F14VectorMap<uint64_t, uint64_t>;
TMap h;
auto populate = [](TMap& h, uint64_t lo, uint64_t hi) { auto populate = [](TMap& h, uint64_t lo, uint64_t hi) {
for (auto i = lo; i < hi; ++i) { for (auto i = lo; i < hi; ++i) {
h.emplace(i, i); h.emplace(i, i);
...@@ -432,7 +431,7 @@ TEST(F14VectorMap, reverse_iterator) { ...@@ -432,7 +431,7 @@ TEST(F14VectorMap, reverse_iterator) {
} }
EXPECT_EQ(hi, val); EXPECT_EQ(hi, val);
}; };
TMap h;
size_t prevSize = 0; size_t prevSize = 0;
size_t newSize = 1; size_t newSize = 1;
// verify iteration order across rehashes, copies, and moves // verify iteration order across rehashes, copies, and moves
......
...@@ -376,7 +376,6 @@ TEST(F14FastSet, simple) { ...@@ -376,7 +376,6 @@ TEST(F14FastSet, simple) {
TEST(F14VectorMap, reverse_iterator) { TEST(F14VectorMap, reverse_iterator) {
using TSet = F14VectorSet<uint64_t>; using TSet = F14VectorSet<uint64_t>;
TSet h;
auto populate = [](TSet& h, uint64_t lo, uint64_t hi) { auto populate = [](TSet& h, uint64_t lo, uint64_t hi) {
for (auto i = lo; i < hi; ++i) { for (auto i = lo; i < hi; ++i) {
h.insert(i); h.insert(i);
...@@ -395,6 +394,7 @@ TEST(F14VectorMap, reverse_iterator) { ...@@ -395,6 +394,7 @@ TEST(F14VectorMap, reverse_iterator) {
EXPECT_EQ(hi, val); EXPECT_EQ(hi, val);
}; };
TSet h;
size_t prevSize = 0; size_t prevSize = 0;
size_t newSize = 1; size_t newSize = 1;
// verify iteration order across rehashes, copies, and moves // verify iteration order across rehashes, copies, and moves
......
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