From 1132246d5685f87a5b240e077b7e88d56e38b1ff Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 14 Sep 2017 17:58:19 +0300 Subject: [PATCH 1/1] Fixed -Wshadow warnings --- cds/container/ellen_bintree_set_rcu.h | 2 +- cds/container/impl/bronson_avltree_map_rcu.h | 6 +- cds/container/impl/ellen_bintree_set.h | 2 +- test/stress/queue/pop.cpp | 4 +- test/stress/queue/push_pop.cpp | 10 ++-- .../test_intrusive_skiplist_rcu.h | 4 +- test/unit/tree/test_bronson_avltree_map_ptr.h | 60 +++++++++---------- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h index 8d0da850..dd5c4191 100644 --- a/cds/container/ellen_bintree_set_rcu.h +++ b/cds/container/ellen_bintree_set_rcu.h @@ -232,7 +232,7 @@ namespace cds { namespace container { bool insert( Q const& val, Func f ) { scoped_node_ptr sp( cxx_leaf_node_allocator().New( val )); - if ( base_class::insert( *sp.get(), [&f]( leaf_node& val ) { f( val.m_Value ); } )) { + if ( base_class::insert( *sp.get(), [&f]( leaf_node& v ) { f( v.m_Value ); } )) { sp.release(); return true; } diff --git a/cds/container/impl/bronson_avltree_map_rcu.h b/cds/container/impl/bronson_avltree_map_rcu.h index a855ff24..458cbdb7 100644 --- a/cds/container/impl/bronson_avltree_map_rcu.h +++ b/cds/container/impl/bronson_avltree_map_rcu.h @@ -1410,10 +1410,10 @@ namespace cds { namespace container { { node_type * pNew; - auto fnCreateNode = [&funcUpdate]( node_type * pNode ) { - mapped_type pVal = funcUpdate( pNode ); + auto fnCreateNode = [&funcUpdate]( node_type * node ) { + mapped_type pVal = funcUpdate( node ); assert( pVal != nullptr ); - pNode->m_pValue.store( pVal, memory_model::memory_order_release ); + node->m_pValue.store( pVal, memory_model::memory_order_release ); }; static_if ( c_bRelaxedInsert ) { diff --git a/cds/container/impl/ellen_bintree_set.h b/cds/container/impl/ellen_bintree_set.h index 365e7a6a..5f93f464 100644 --- a/cds/container/impl/ellen_bintree_set.h +++ b/cds/container/impl/ellen_bintree_set.h @@ -227,7 +227,7 @@ namespace cds { namespace container { bool insert( Q const& val, Func f ) { scoped_node_ptr sp( cxx_leaf_node_allocator().New( val )); - if ( base_class::insert( *sp.get(), [&f]( leaf_node& val ) { f( val.m_Value ); } )) { + if ( base_class::insert( *sp.get(), [&f]( leaf_node& v ) { f( v.m_Value ); } )) { sp.release(); return true; } diff --git a/test/stress/queue/pop.cpp b/test/stress/queue/pop.cpp index 21c06105..cd5ab8a5 100644 --- a/test/stress/queue/pop.cpp +++ b/test/stress/queue/pop.cpp @@ -131,8 +131,8 @@ namespace { size_t nTotalPops = 0; for ( size_t i = 0; i < pool.size(); ++i ) { Consumer& thread = static_cast&>(pool.get( i )); - for ( size_t i = 0; i < s_nQueueSize; ++i ) - arr[i] += thread.m_arr[i]; + for ( size_t j = 0; j < s_nQueueSize; ++j ) + arr[j] += thread.m_arr[j]; nTotalPops += thread.m_nPopCount; } EXPECT_EQ( nTotalPops, s_nQueueSize ); diff --git a/test/stress/queue/push_pop.cpp b/test/stress/queue/push_pop.cpp index 47a4097d..148fde41 100644 --- a/test/stress/queue/push_pop.cpp +++ b/test/stress/queue/push_pop.cpp @@ -200,8 +200,8 @@ namespace { { cds_test::thread_pool& pool = get_pool(); - typedef Consumer Consumer; - typedef Producer Producer; + typedef Consumer consumer_type; + typedef Producer producer_type; size_t nPostTestPops = 0; { @@ -215,12 +215,12 @@ namespace { size_t nPoppedItems = 0; size_t nPushFailed = 0; - std::vector< Consumer * > arrConsumer; + std::vector< consumer_type * > arrConsumer; for ( size_t i = 0; i < pool.size(); ++i ) { cds_test::thread& thr = pool.get(i); if ( thr.type() == consumer_thread ) { - Consumer& consumer = static_cast( thr ); + consumer_type& consumer = static_cast( thr ); nTotalPops += consumer.m_nPopped; nPopFalse += consumer.m_nPopEmpty; arrConsumer.push_back( &consumer ); @@ -235,7 +235,7 @@ namespace { else { assert( thr.type() == producer_thread ); - Producer& producer = static_cast( thr ); + producer_type& producer = static_cast( thr ); nPushFailed += producer.m_nPushFailed; EXPECT_EQ( producer.m_nPushFailed, 0u ) << "producer_thread_no " << i; } diff --git a/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h b/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h index 63347a8b..cbfdfba4 100644 --- a/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h +++ b/test/unit/intrusive-set/test_intrusive_skiplist_rcu.h @@ -213,13 +213,13 @@ TYPED_TEST_P( IntrusiveSkipListSet, base_turbo24 ) typedef typename TestFixture::rcu_type rcu_type; typedef typename TestFixture::base_item_type base_item_type; typedef typename TestFixture::mock_disposer mock_disposer; - typedef typename TestFixture::template cmp cmp; + typedef typename TestFixture::template cmp item_cmp; struct traits: public ci::skip_list::traits { typedef ci::skip_list::base_hook< ci::opt::gc< rcu_type >> hook; typedef mock_disposer disposer; - typedef cmp compare; + typedef item_cmp compare; typedef ci::skip_list::turbo24 random_level_generator; }; diff --git a/test/unit/tree/test_bronson_avltree_map_ptr.h b/test/unit/tree/test_bronson_avltree_map_ptr.h index 4ec6ea32..091a173f 100644 --- a/test/unit/tree/test_bronson_avltree_map_ptr.h +++ b/test/unit/tree/test_bronson_avltree_map_ptr.h @@ -113,25 +113,25 @@ namespace { case 0: ASSERT_TRUE( m.insert( i, &val )); ASSERT_FALSE( m.insert( i, &val )); - ASSERT_TRUE( m.find( i.nKey, []( key_type const& key, mapped_type& val ) { - val.nVal = key.nKey; - val.strVal = std::to_string( key.nKey ); + ASSERT_TRUE( m.find( i.nKey, []( key_type const& k, mapped_type& v ) { + v.nVal = k.nKey; + v.strVal = std::to_string( k.nKey ); } )); break; case 1: ASSERT_TRUE( m.insert( i.nKey, &val )); ASSERT_FALSE( m.insert( i.nKey, &val )); - ASSERT_TRUE( m.find( i.nKey, []( key_type const& key, mapped_type& val ) { - val.nVal = key.nKey; - val.strVal = std::to_string( key.nKey ); + ASSERT_TRUE( m.find( i.nKey, []( key_type const& k, mapped_type& v ) { + v.nVal = k.nKey; + v.strVal = std::to_string( k.nKey ); } )); break; case 2: ASSERT_TRUE( m.insert( std::to_string( i.nKey ), &val )); ASSERT_FALSE( m.insert( std::to_string( i.nKey ), &val )); - ASSERT_TRUE( m.find( i.nKey, []( key_type const& key, mapped_type& val ) { - val.nVal = key.nKey; - val.strVal = std::to_string( key.nKey ); + ASSERT_TRUE( m.find( i.nKey, []( key_type const& k, mapped_type& v ) { + v.nVal = k.nKey; + v.strVal = std::to_string( k.nKey ); } )); break; case 3: @@ -178,17 +178,17 @@ namespace { ASSERT_TRUE( m.contains( i.nKey )); ASSERT_TRUE( m.contains( i )); ASSERT_TRUE( m.contains( other_item( i.nKey ), other_less())); - ASSERT_TRUE( m.find( i, []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find( i, []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); - ASSERT_TRUE( m.find( i.nKey, []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find( i.nKey, []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); - ASSERT_TRUE( m.find_with( other_item( i.nKey ), other_less(), []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find_with( other_item( i.nKey ), other_less(), []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); } ASSERT_FALSE( m.empty()); @@ -206,17 +206,17 @@ namespace { ASSERT_TRUE( m.contains( val.strVal )); ASSERT_TRUE( m.contains( i )); ASSERT_TRUE( m.contains( other_item( i.nKey ), other_less())); - ASSERT_TRUE( m.find( i, []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find( i, []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); - ASSERT_TRUE( m.find( i.nKey, []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find( i.nKey, []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); - ASSERT_TRUE( m.find_with( other_item( i.nKey ), other_less(), []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.find_with( other_item( i.nKey ), other_less(), []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); } )); @@ -238,9 +238,9 @@ namespace { ASSERT_FALSE( m.erase_with( other_item( i.nKey ), other_less())); break; case 4: - ASSERT_TRUE( m.erase( i, []( key_type const& key, mapped_type& val ) { - EXPECT_EQ( key.nKey, val.nVal ); - EXPECT_EQ( std::to_string( key.nKey ), val.strVal ); + ASSERT_TRUE( m.erase( i, []( key_type const& k, mapped_type& v ) { + EXPECT_EQ( k.nKey, v.nVal ); + EXPECT_EQ( std::to_string( k.nKey ), v.strVal ); })); ASSERT_FALSE( m.erase( i, []( key_type const& /*key*/, mapped_type& /*val*/ ) { EXPECT_TRUE( false ); -- 2.34.1