From: khizmax Date: Tue, 25 Nov 2014 19:03:13 +0000 (+0300) Subject: Removed unused vars X-Git-Tag: v2.0.0~55 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=55dac5c902cf22ef7588b97ce412a107be3d2d05;hp=1de4e60554a1aaf3406380808093fb4a9d08bd76 Removed unused vars --- diff --git a/cds/container/cuckoo_set.h b/cds/container/cuckoo_set.h index b94f6bfb..e7e50d4b 100644 --- a/cds/container/cuckoo_set.h +++ b/cds/container/cuckoo_set.h @@ -603,6 +603,7 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Predicate pred ) { + CDS_UNUSED( pred ); node_type * pNode = base_class::erase_with( key, typename maker::template predicate_wrapper() ); if ( pNode ) { free_node( pNode ); @@ -649,6 +650,7 @@ namespace cds { namespace container { template bool erase_with( Q const& key, Predicate pred, Func f ) { + CDS_UNUSED( pred ); node_type * pNode = base_class::erase_with( key, typename maker::template predicate_wrapper() ); if ( pNode ) { f( pNode->m_val ); @@ -696,6 +698,7 @@ namespace cds { namespace container { template bool find_with( Q& val, Predicate pred, Func f ) { + CDS_UNUSED( pred ); return base_class::find_with( val, typename maker::template predicate_wrapper(), [&f](node_type& item, Q& v) { f( item.m_val, v );}); } @@ -736,6 +739,7 @@ namespace cds { namespace container { template bool find_with( Q const& val, Predicate pred, Func f ) { + CDS_UNUSED( pred ); return base_class::find_with( val, typename maker::template predicate_wrapper(), [&f](node_type& item, Q const& v) { f( item.m_val, v );}); } @@ -766,6 +770,7 @@ namespace cds { namespace container { template bool find_with( Q const& val, Predicate pred ) { + CDS_UNUSED( pred ); return base_class::find_with( val, typename maker::template predicate_wrapper(), [](node_type&, Q const&) {}); } diff --git a/cds/intrusive/ellen_bintree_rcu.h b/cds/intrusive/ellen_bintree_rcu.h index cdaa96ea..c0cc2ff3 100644 --- a/cds/intrusive/ellen_bintree_rcu.h +++ b/cds/intrusive/ellen_bintree_rcu.h @@ -1305,7 +1305,7 @@ namespace cds { namespace intrusive { return false; } - void help( update_ptr pUpdate, retired_list& rl ) + void help( update_ptr /*pUpdate*/, retired_list& /*rl*/ ) { /* switch ( pUpdate.bits() ) { @@ -1642,7 +1642,7 @@ namespace cds { namespace intrusive { } template - value_type * extract_with_( Q const& val, Less pred ) + value_type * extract_with_( Q const& val, Less /*pred*/ ) { CDS_UNUSED( pred ); typedef ellen_bintree::details::compare< @@ -1849,7 +1849,7 @@ namespace cds { namespace intrusive { } template - bool find_with_( Q& val, Less pred, Func f ) const + bool find_with_( Q& val, Less /*pred*/, Func f ) const { CDS_UNUSED( pred ); typedef ellen_bintree::details::compare< diff --git a/cds/intrusive/impl/ellen_bintree.h b/cds/intrusive/impl/ellen_bintree.h index dbcafc11..37ec5bf5 100644 --- a/cds/intrusive/impl/ellen_bintree.h +++ b/cds/intrusive/impl/ellen_bintree.h @@ -1337,7 +1337,7 @@ namespace cds { namespace intrusive { } template - bool extract_with_( typename guarded_ptr::native_guard& guard, Q const& key, Less pred ) + bool extract_with_( typename guarded_ptr::native_guard& guard, Q const& key, Less /*pred*/ ) { CDS_UNUSED( pred ); typedef ellen_bintree::details::compare< @@ -1469,7 +1469,7 @@ namespace cds { namespace intrusive { } template - bool find_with_( Q& val, Less pred, Func f ) const + bool find_with_( Q& val, Less /*pred*/, Func f ) const { CDS_UNUSED( pred ); typedef ellen_bintree::details::compare< diff --git a/tests/unit/set2/std_hash_set.h b/tests/unit/set2/std_hash_set.h index dcc6c422..2089bb05 100644 --- a/tests/unit/set2/std_hash_set.h +++ b/tests/unit/set2/std_hash_set.h @@ -31,7 +31,7 @@ namespace set2 { public: typedef typename base_class::value_type value_type; - StdHashSet( size_t nSetSize, size_t nLoadFactor ) + StdHashSet( size_t /*nSetSize*/, size_t /*nLoadFactor*/ ) {} template diff --git a/tests/unit/set2/std_set.h b/tests/unit/set2/std_set.h index 096b121f..09f8fc0f 100644 --- a/tests/unit/set2/std_set.h +++ b/tests/unit/set2/std_set.h @@ -18,7 +18,7 @@ namespace set2 { public: typedef typename base_class::key_type value_type; - StdSet( size_t nMapSize, size_t nLoadFactor ) + StdSet( size_t /*nMapSize*/, size_t /*nLoadFactor*/ ) {} template