replace null_ptr<>() with nullptr

[libcds.git] / cds / container / details / make_skip_list_map.h

diff --git a/cds/container/details/make_skip_list_map.h b/cds/container/details/make_skip_list_map.h
index b91c9983e0fde295a632a908d16c94d47956bc1f..a8b5dbde95ba5883d103835461f9b025e53576a5 100644 (file)
--- a/cds/container/details/make_skip_list_map.h
+++ b/cds/container/details/make_skip_list_map.h
@@ -78,9 +78,9 @@ namespace cds { namespace container { namespace details {
                 unsigned char * pMem = base_class::alloc_space( nHeight );
                 return new( pMem )
                     node_type( nHeight,
-                        nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize )
-                            : null_ptr<typename base_class::node_tower_item *>(),
-                        key, val );
+                        nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
+                        key, val 
+                    );
             }
 #       ifdef CDS_EMPLACE_SUPPORT
             template <typename... Args>
@@ -88,9 +88,10 @@ namespace cds { namespace container { namespace details {
             {
                 unsigned char * pMem = base_class::alloc_space( nHeight );
                 return new( pMem )
-                    node_type( nHeight, nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize )
-                        : null_ptr<typename base_class::node_tower_item *>(),
-                    std::forward<Args>(args)... );
+                    node_type( nHeight, 
+                        nHeight > 1 ? reinterpret_cast<typename base_class::node_tower_item *>( pMem + base_class::c_nNodeSize ) : nullptr,
+                        std::forward<Args>(args)... 
+                    );
             }
 #       endif
         };