Remove CDS_EMPLACE_SUPPORT macro and unused code

[libcds.git] / cds / container / skip_list_base.h

diff --git a/cds/container/skip_list_base.h b/cds/container/skip_list_base.h
index c52f0155edecdf8c32f50a8f16da5614903caeaf..9d50da06ac9b2ac1302947c4089d53b16db3f6c0 100644 (file)
--- a/cds/container/skip_list_base.h
+++ b/cds/container/skip_list_base.h
@@ -166,7 +166,7 @@ namespace cds { namespace container {
 
                 static void free_space( unsigned char * p, unsigned int nHeight )
                 {
-                    assert( p != null_ptr<unsigned char *>() );
+                    assert( p != nullptr );
                     if ( nHeight == 1 )
                         node_allocator_type().deallocate( reinterpret_cast<node_type *>(p), 1 );
                     else
@@ -179,23 +179,21 @@ namespace cds { namespace container {
                 {
                     unsigned char * pMem = alloc_space( nHeight );
                     return new( pMem )
-                        node_type( nHeight, nHeight > 1 ? reinterpret_cast<node_tower_item *>( pMem + c_nNodeSize ) : null_ptr<node_tower_item *>(), v );
+                        node_type( nHeight, nHeight > 1 ? reinterpret_cast<node_tower_item *>(pMem + c_nNodeSize) : nullptr, v );
                 }
 
-#       ifdef CDS_EMPLACE_SUPPORT
                 template <typename... Args>
                 node_type * New( unsigned int nHeight, Args&&... args )
                 {
                     unsigned char * pMem = alloc_space( nHeight );
                     return new( pMem )
-                        node_type( nHeight, nHeight > 1 ? reinterpret_cast<node_tower_item *>( pMem + c_nNodeSize ): null_ptr<node_tower_item *>(),
+                        node_type( nHeight, nHeight > 1 ? reinterpret_cast<node_tower_item *>(pMem + c_nNodeSize) : nullptr,
                         std::forward<Args>(args)... );
                 }
-#       endif
 
                 void Delete( node_type * p )
                 {
-                    assert( p != null_ptr<node_type *>() );
+                    assert( p != nullptr );
 
                     unsigned int nHeight = p->height();
                     node_allocator_type().destroy( p );