projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed -Wshadow warnings
[libcds.git]
/
cds
/
container
/
impl
/
bronson_avltree_map_rcu.h
diff --git
a/cds/container/impl/bronson_avltree_map_rcu.h
b/cds/container/impl/bronson_avltree_map_rcu.h
index f21253b5728529262d7bf252b7290dc1d3a53f49..a855ff24b00d851d57ef5b9ff38ded62dd060aa4 100644
(file)
--- a/
cds/container/impl/bronson_avltree_map_rcu.h
+++ b/
cds/container/impl/bronson_avltree_map_rcu.h
@@
-381,9
+381,9
@@
namespace cds { namespace container {
return do_remove(
key,
key_comparator(),
return do_remove(
key,
key_comparator(),
- [&f]( key_type const& k
ey
, mapped_type pVal, rcu_disposer& disp ) -> bool {
+ [&f]( key_type const& k, mapped_type pVal, rcu_disposer& disp ) -> bool {
assert( pVal );
assert( pVal );
- f( k
ey
, *pVal );
+ f( k, *pVal );
disp.dispose_value(pVal);
return true;
}
disp.dispose_value(pVal);
return true;
}
@@
-404,9
+404,9
@@
namespace cds { namespace container {
return do_remove(
key,
cds::opt::details::make_comparator_from_less<Less>(),
return do_remove(
key,
cds::opt::details::make_comparator_from_less<Less>(),
- [&f]( key_type const& k
ey
, mapped_type pVal, rcu_disposer& disp ) -> bool {
+ [&f]( key_type const& k, mapped_type pVal, rcu_disposer& disp ) -> bool {
assert( pVal );
assert( pVal );
- f( k
ey
, *pVal );
+ f( k, *pVal );
disp.dispose_value(pVal);
return true;
}
disp.dispose_value(pVal);
return true;
}
@@
-1410,10
+1410,10
@@
namespace cds { namespace container {
{
node_type * pNew;
{
node_type * pNew;
- auto fnCreateNode = [&funcUpdate]( node_type * pN
ew
) {
- mapped_type pVal = funcUpdate( pN
ew
);
+ auto fnCreateNode = [&funcUpdate]( node_type * pN
ode
) {
+ mapped_type pVal = funcUpdate( pN
ode
);
assert( pVal != nullptr );
assert( pVal != nullptr );
- pN
ew
->m_pValue.store( pVal, memory_model::memory_order_release );
+ pN
ode
->m_pValue.store( pVal, memory_model::memory_order_release );
};
static_if ( c_bRelaxedInsert ) {
};
static_if ( c_bRelaxedInsert ) {