replace null_ptr<>() with nullptr

[libcds.git] / cds / intrusive / single_link_struct.h

diff --git a/cds/intrusive/single_link_struct.h b/cds/intrusive/single_link_struct.h
index c17f342ec6907a3e13c564ded4e3320a827e661f..eea6176502cdb4ec463a4fb20d06a7732b675dc4 100644 (file)
--- a/cds/intrusive/single_link_struct.h
+++ b/cds/intrusive/single_link_struct.h
@@ -38,7 +38,7 @@ namespace cds { namespace intrusive {
             atomic_node_ptr m_pNext ; ///< pointer to the next node in the container
 
             node()
-                : m_pNext( null_ptr<node *>() )
+                : m_pNext( nullptr )
             {}
         };
 
@@ -54,13 +54,13 @@ namespace cds { namespace intrusive {
             atomic_node_ptr m_pNext ; ///< pointer to the next node in the container
 
             node()
-                : m_pNext(null_ptr<node *>())
+                : m_pNext( nullptr )
             {}
 
         protected:
             virtual void cleanUp( cds::gc::hrc::ThreadGC * pGC )
             {
-                assert( pGC != null_ptr<cds::gc::hrc::ThreadGC *>() );
+                assert( pGC != nullptr );
                 typename gc::GuardArray<2> aGuards( *pGC );
 
                 while ( true ) {
@@ -80,10 +80,10 @@ namespace cds { namespace intrusive {
             {
                 if ( bConcurrent ) {
                     node * pNext = m_pNext.load(CDS_ATOMIC::memory_order_relaxed);
-                    do {} while ( !m_pNext.compare_exchange_weak( pNext, null_ptr<node *>(), CDS_ATOMIC::memory_order_release, CDS_ATOMIC::memory_order_relaxed ) );
+                    do {} while ( !m_pNext.compare_exchange_weak( pNext, nullptr, CDS_ATOMIC::memory_order_release, CDS_ATOMIC::memory_order_relaxed ) );
                 }
                 else {
-                    m_pNext.store( null_ptr<node *>(), CDS_ATOMIC::memory_order_relaxed );
+                    m_pNext.store( nullptr, CDS_ATOMIC::memory_order_relaxed );
                 }
             }
         };
@@ -166,7 +166,7 @@ namespace cds { namespace intrusive {
             */
             static void is_empty( const node_type * pNode )
             {
-                assert( pNode->m_pNext.load(CDS_ATOMIC::memory_order_relaxed) == null_ptr<node_type *>() );
+                assert( pNode->m_pNext.load( CDS_ATOMIC::memory_order_relaxed ) == nullptr );
             }
         };