From 42b1203c07023b92e78aabbfd0324b99cf04554a Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 6 Oct 2016 19:54:01 +0300 Subject: [PATCH] IterableList: renamed some internal methods --- cds/intrusive/impl/iterable_list.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cds/intrusive/impl/iterable_list.h b/cds/intrusive/impl/iterable_list.h index d16cf1c0..eb87e3e8 100644 --- a/cds/intrusive/impl/iterable_list.h +++ b/cds/intrusive/impl/iterable_list.h @@ -779,7 +779,7 @@ namespace cds { namespace intrusive { pos.pFound = pos.guard.protect( pos.pCur->data, []( marked_data_ptr p ) { return p.ptr(); }).ptr(); if ( !pos.pFound ) break; - if ( cds_likely( unlink_node( pos ))) { + if ( cds_likely( unlink_data( pos ))) { --m_ItemCounter; break; } @@ -845,7 +845,7 @@ namespace cds { namespace intrusive { return false; } - if ( link_node( &val, pos ) ) { + if ( link_data( &val, pos ) ) { ++m_ItemCounter; m_Stat.onInsertSuccess(); return true; @@ -869,7 +869,7 @@ namespace cds { namespace intrusive { return false; } - if ( link_node( &val, pos ) ) { + if ( link_data( &val, pos ) ) { f( val ); ++m_ItemCounter; m_Stat.onInsertSuccess(); @@ -912,7 +912,7 @@ namespace cds { namespace intrusive { return std::make_pair( false, false ); } - if ( link_node( &val, pos )) { + if ( link_data( &val, pos )) { func( val, static_cast( nullptr )); ++m_ItemCounter; m_Stat.onUpdateNew(); @@ -931,7 +931,7 @@ namespace cds { namespace intrusive { back_off bkoff; while ( search( refHead, val, pos, key_comparator())) { if ( pos.pFound == &val ) { - if ( unlink_node( pos )) { + if ( unlink_data( pos )) { --m_ItemCounter; m_Stat.onEraseSuccess(); return true; @@ -954,7 +954,7 @@ namespace cds { namespace intrusive { { back_off bkoff; while ( search( refHead, val, pos, cmp )) { - if ( unlink_node( pos )) { + if ( unlink_data( pos )) { f( *pos.pFound ); --m_ItemCounter; m_Stat.onEraseSuccess(); @@ -990,7 +990,7 @@ namespace cds { namespace intrusive { position pos; back_off bkoff; while ( search( refHead, val, pos, cmp )) { - if ( unlink_node( pos )) { + if ( unlink_data( pos )) { --m_ItemCounter; m_Stat.onEraseSuccess(); assert( pos.pFound != nullptr ); @@ -1140,7 +1140,7 @@ namespace cds { namespace intrusive { } } - bool link_node( value_type * pVal, position& pos ) + bool link_data( value_type * pVal, position& pos ) { if ( pos.pPrev ) { if ( pos.pPrev->data.load( memory_model::memory_order_relaxed ) == marked_data_ptr() ) { @@ -1200,7 +1200,7 @@ namespace cds { namespace intrusive { return false; } - static bool unlink_node( position& pos ) + static bool unlink_data( position& pos ) { assert( pos.pCur != nullptr ); assert( pos.pFound != nullptr ); -- 2.34.1