replace null_ptr<>() with nullptr

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

diff --git a/cds/intrusive/moir_queue.h b/cds/intrusive/moir_queue.h
index 29e081215b6e684585e7e5e90a49b55ee2f1a0d2..0ccbbdc3f0c351e5066d52befa2f69829b07b195 100644 (file)
--- a/cds/intrusive/moir_queue.h
+++ b/cds/intrusive/moir_queue.h
@@ -123,7 +123,7 @@ namespace cds { namespace intrusive {
                 h = res.guards.protect( 0, base_class::m_pHead, node_to_value() );
                 pNext = res.guards.protect( 1, h->m_pNext, node_to_value() );
 
-                if ( pNext == null_ptr<node_type *>() )
+                if ( pNext == nullptr )
                     return false    ;    // queue is empty
 
                 if ( base_class::m_pHead.compare_exchange_strong( h, pNext, memory_model::memory_order_release, CDS_ATOMIC::memory_order_relaxed )) {
@@ -158,7 +158,7 @@ namespace cds { namespace intrusive {
                 base_class::dispose_result( res );
                 return node_traits::to_value_ptr( *res.pNext );
             }
-            return null_ptr<value_type *>();
+            return nullptr;
         }
 
         /// Synonym for \ref cds_intrusive_MoirQueue_dequeue "dequeue" function