1 files changed, 35 insertions, 35 deletions

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
index 7a6952fdad4..4e8a1c2d8cc 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
@@ -49,11 +49,11 @@ push(const_reference r_val)
 
   p_nd->m_metadata = 0;
 
-  p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = NULL;
+  p_nd->m_p_prev_or_parent = p_nd->m_p_l_child = 0;
 
-  if (base_type::m_p_root == NULL)
+  if (base_type::m_p_root == 0)
     {
-      p_nd->m_p_next_sibling = NULL;
+      p_nd->m_p_next_sibling = 0;
 
       m_p_max = base_type::m_p_root = p_nd;
 
@@ -64,7 +64,7 @@ push(const_reference r_val)
 
   p_nd->m_p_next_sibling = base_type::m_p_root;
 
-  base_type::m_p_root->m_p_prev_or_parent = NULL;
+  base_type::m_p_root->m_p_prev_or_parent = 0;
 
   base_type::m_p_root = p_nd;
 
@@ -81,7 +81,7 @@ PB_DS_CLASS_C_DEC::
 make_root(node_pointer p_nd)
 {
   p_nd->m_metadata =
-    p_nd->m_p_l_child == NULL?
+    p_nd->m_p_l_child == 0?
     0 :
     1 + p_nd->m_p_l_child->m_metadata;
 }
@@ -93,12 +93,12 @@ make_root_and_link(node_pointer p_nd)
 {
   make_root(p_nd);
 
-  p_nd->m_p_prev_or_parent = NULL;
+  p_nd->m_p_prev_or_parent = 0;
 
   p_nd->m_p_next_sibling = base_type::m_p_root;
 
-  if (base_type::m_p_root != NULL)
-    base_type::m_p_root->m_p_prev_or_parent = NULL;
+  if (base_type::m_p_root != 0)
+    base_type::m_p_root->m_p_prev_or_parent = 0;
 
   base_type::m_p_root = p_nd;
 
@@ -112,15 +112,15 @@ fix(node_pointer p_y)
 {
   while (true)
     {
-      if (p_y->m_p_prev_or_parent == NULL)
+      if (p_y->m_p_prev_or_parent == 0)
         {
 	  fix_root(p_y);
 
 	  return;
         }
-      else if (p_y->m_metadata == 1&&  p_y->m_p_next_sibling == NULL)
+      else if (p_y->m_metadata == 1&&  p_y->m_p_next_sibling == 0)
         {
-	  if (p_y->m_p_l_child != NULL)
+	  if (p_y->m_p_l_child != 0)
             {
 	      fix_sibling_rank_1_unmarked(p_y);
 
@@ -133,7 +133,7 @@ fix(node_pointer p_y)
         }
       else if (p_y->m_metadata > p_y->m_p_next_sibling->m_metadata + 1)
         {
-	  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child != NULL);
+	  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child != 0);
 
 	  if (p_y->m_metadata != p_y->m_p_l_child->m_metadata + 2)
             {
@@ -146,8 +146,8 @@ fix(node_pointer p_y)
 
 	  p_y = p_y->m_p_prev_or_parent;
         }
-      else if ((p_y->m_p_l_child == NULL&& 
-                p_y->m_metadata == 2) ||(p_y->m_p_l_child != NULL&& 
+      else if ((p_y->m_p_l_child == 0&& 
+                p_y->m_metadata == 2) ||(p_y->m_p_l_child != 0&& 
 					 p_y->m_metadata == p_y->m_p_l_child->m_metadata + 3))
         {
 	  node_pointer p_z = p_y->m_p_prev_or_parent;
@@ -166,7 +166,7 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_root(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent == NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent == 0);
 
   make_root(p_y);
 
@@ -178,18 +178,18 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_sibling_rank_1_unmarked(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
 
   _GLIBCXX_DEBUG_ONLY(node_pointer p_w = p_y->m_p_l_child;)
-    _GLIBCXX_DEBUG_ASSERT(p_w != NULL);
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling == NULL);
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_next_sibling == NULL);
+    _GLIBCXX_DEBUG_ASSERT(p_w != 0);
+  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling == 0);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_next_sibling == 0);
 
   p_y->m_p_next_sibling = p_y->m_p_l_child;
 
   p_y->m_p_next_sibling->m_p_prev_or_parent = p_y;
 
-  p_y->m_p_l_child = NULL;
+  p_y->m_p_l_child = 0;
 
   _GLIBCXX_DEBUG_ONLY(assert_node_consistent(p_y, false);)
     }
@@ -199,8 +199,8 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_sibling_rank_1_marked(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL);
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child == NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_l_child == 0);
 
   p_y->m_metadata = 0;
 
@@ -212,17 +212,17 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_sibling_general_unmarked(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
 
   node_pointer p_w = p_y->m_p_l_child;
-  _GLIBCXX_DEBUG_ASSERT(p_w != NULL);
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_w != 0);
+  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0);
 
   p_y->m_p_l_child = p_w->m_p_next_sibling;
   p_w->m_p_next_sibling->m_p_prev_or_parent = p_y;
 
   p_w->m_p_next_sibling = p_y->m_p_next_sibling;
-  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_w->m_p_next_sibling != 0);
   p_w->m_p_next_sibling->m_p_prev_or_parent = p_w;
 
   p_y->m_p_next_sibling = p_w;
@@ -236,7 +236,7 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_sibling_general_marked(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
 
   --p_y->m_metadata;
 
@@ -248,9 +248,9 @@ inline void
 PB_DS_CLASS_C_DEC::
 fix_child(node_pointer p_y)
 {
-  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y->m_p_prev_or_parent != 0);
 
-  if (p_y->m_p_next_sibling != NULL)
+  if (p_y->m_p_next_sibling != 0)
     p_y->m_p_next_sibling->m_p_prev_or_parent = p_y->m_p_prev_or_parent;
 
   if (p_y->m_p_prev_or_parent->m_p_l_child == p_y)
@@ -269,7 +269,7 @@ modify(point_iterator it, const_reference r_new_val)
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
     node_pointer p_nd = it.m_p_nd;
 
-  _GLIBCXX_DEBUG_ASSERT(p_nd != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_nd != 0);
 
   const bool smaller = Cmp_Fn::operator()(r_new_val, p_nd->m_value);
 
@@ -279,7 +279,7 @@ modify(point_iterator it, const_reference r_new_val)
     {
       remove_node(p_nd);
 
-      p_nd->m_p_l_child = NULL;
+      p_nd->m_p_l_child = 0;
 
       make_root_and_link(p_nd);
 
@@ -288,7 +288,7 @@ modify(point_iterator it, const_reference r_new_val)
         return;
     }
 
-  if (p_nd->m_p_prev_or_parent == NULL)
+  if (p_nd->m_p_prev_or_parent == 0)
     {
       update_max(p_nd);
 
@@ -298,9 +298,9 @@ modify(point_iterator it, const_reference r_new_val)
     }
 
   node_pointer p_y = p_nd->m_p_prev_or_parent;
-  _GLIBCXX_DEBUG_ASSERT(p_y != NULL);
+  _GLIBCXX_DEBUG_ASSERT(p_y != 0);
 
-  if (p_nd->m_p_next_sibling != NULL)
+  if (p_nd->m_p_next_sibling != 0)
     p_nd->m_p_next_sibling->m_p_prev_or_parent = p_y;
 
   if (p_y->m_p_l_child == p_nd)
@@ -320,7 +320,7 @@ inline void
 PB_DS_CLASS_C_DEC::
 update_max(node_pointer p_nd)
 {
-  if (m_p_max == NULL || Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value))
+  if (m_p_max == 0 || Cmp_Fn::operator()(m_p_max->m_value, p_nd->m_value))
     m_p_max = p_nd;
 }