X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fintrusive%2Fmsqueue.h;h=0313390559b6f524aa60874e939227b133ab7ea7;hb=e360657e258514a73ab99af0bd726c21d05156fc;hp=5eafbba3b0f9bb93ff7620d91128cb75c2f3a5cd;hpb=dcfc955eac8d172e1da77d150edc6e17b54ef5a0;p=libcds.git diff --git a/cds/intrusive/msqueue.h b/cds/intrusive/msqueue.h index 5eafbba3..03133905 100644 --- a/cds/intrusive/msqueue.h +++ b/cds/intrusive/msqueue.h @@ -1,7 +1,7 @@ /* This file is a part of libcds - Concurrent Data Structures library - (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 Source code repo: http://github.com/khizmax/libcds/ Download: http://sourceforge.net/projects/libcds/files/ @@ -456,13 +456,13 @@ namespace cds { namespace intrusive { void operator()( value_type * p ) const { assert( p != nullptr ); - MSQueue::clear_links( node_traits::to_node_ptr( p ) ); + MSQueue::clear_links( node_traits::to_node_ptr( p )); disposer()(p); } }; if ( p != &m_Dummy ) - gc::template retire( node_traits::to_value_ptr( p ) ); + gc::template retire( node_traits::to_value_ptr( p )); } //@endcond @@ -485,7 +485,7 @@ namespace cds { namespace intrusive { node_type * pHead = m_pHead.load(memory_model::memory_order_relaxed); assert( pHead != nullptr ); - assert( pHead == m_pTail.load(memory_model::memory_order_relaxed) ); + assert( pHead == m_pTail.load(memory_model::memory_order_relaxed)); m_pHead.store( nullptr, memory_model::memory_order_relaxed ); m_pTail.store( nullptr, memory_model::memory_order_relaxed ); @@ -584,7 +584,7 @@ namespace cds { namespace intrusive { bool empty() const { typename gc::Guard guard; - node_type * p = guard.protect( m_pHead, []( node_type * p ) -> value_type * { return node_traits::to_value_ptr( p );}); + node_type * p = guard.protect( m_pHead, []( node_type * pNode ) -> value_type * { return node_traits::to_value_ptr( pNode );}); return p->m_pNext.load( memory_model::memory_order_relaxed ) == nullptr; } @@ -596,7 +596,7 @@ namespace cds { namespace intrusive { */ void clear() { - while ( dequeue() ); + while ( dequeue()); } /// Returns queue's item count