Changed functor signature for erase( Key, Func )

diff --git a/cds/container/bronson_avltree_map_rcu.h b/cds/container/bronson_avltree_map_rcu.h
index 87fd612db8f74b67cf9a719f5e57835346c82afe..b0c24749ffd47af3d35e86219fa5a11fa801c42d 100644 (file)
--- a/cds/container/bronson_avltree_map_rcu.h
+++ b/cds/container/bronson_avltree_map_rcu.h
@@ -337,7 +337,7 @@ namespace cds { namespace container {
             The functor \p Func interface:
             \code
             struct extractor {
-                void operator()(mapped_type& item) { ... }
+                void operator()(key_type const& key, mapped_type& item) { ... }
             };
             \endcode
 

diff --git a/cds/container/impl/bronson_avltree_map_rcu.h b/cds/container/impl/bronson_avltree_map_rcu.h
index efe0f6d2374e5bcf345cf21ddfdac25ded36e229..18d55287ba505e7c86825268a7e2ab71116fe5ce 100644 (file)
--- a/cds/container/impl/bronson_avltree_map_rcu.h
+++ b/cds/container/impl/bronson_avltree_map_rcu.h
@@ -343,7 +343,7 @@ namespace cds { namespace container {
             The functor \p Func interface:
             \code
             struct extractor {
-                void operator()(mapped_type& item) { ... }
+                void operator()( key_type const& key, std::remove_pointer<mapped_type>::type& val) { ... }
             };
             \endcode
 
@@ -357,9 +357,9 @@ namespace cds { namespace container {
             return do_remove( 
                 key, 
                 key_comparator(), 
-                [&f]( key_type const&, mapped_type pVal, rcu_disposer& disp ) -> bool { 
+                [&f]( key_type const& key, mapped_type pVal, rcu_disposer& disp ) -> bool { 
                     assert( pVal );
-                    f( *pVal ); 
+                    f( key, *pVal ); 
                     disp.dispose_value(pVal); 
                     return true;
                 }
@@ -380,9 +380,9 @@ namespace cds { namespace container {
             return do_remove( 
                 key, 
                 cds::opt::details::make_comparator_from_less<Less>(),
-                [&f]( key_type const&, mapped_type pVal, rcu_disposer& disp ) -> bool { 
+                [&f]( key_type const& key, mapped_type pVal, rcu_disposer& disp ) -> bool { 
                     assert( pVal );
-                    f( *pVal ); 
+                    f( key, *pVal ); 
                     disp.dispose_value(pVal); 
                     return true;
                 }