re PR libstdc++/37144 (A bug in include/ext/pb_ds/detail/pat_trie_/constructors_destr...

[thirdparty/gcc.git] / libstdc++-v3 / include / ext / pb_ds / detail / cc_hash_table_map_ / erase_no_store_hash_fn_imps.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
index ffe32103cbea7d236e18d7a934dee7b3eb1e1e0b..1e2661efa55a434f8ff67691e3b3135a973043b3 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
@@ -34,7 +34,7 @@
 // warranty.
 
 /**
- * @file erase_no_store_hash_fn_imps.hpp
+ * @file cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
  * Contains implementations of cc_ht_map_'s erase related functions,
  * when the hash value is not stored.
  */
@@ -42,7 +42,7 @@
 PB_DS_CLASS_T_DEC
 inline bool
 PB_DS_CLASS_C_DEC::
-erase(const_key_reference r_key)
+erase(key_const_reference r_key)
 {
   PB_DS_ASSERT_VALID((*this))
   return erase_in_pos_imp(r_key, ranged_hash_fn_base::operator()(r_key));
@@ -51,7 +51,7 @@ erase(const_key_reference r_key)
 PB_DS_CLASS_T_DEC
 inline bool
 PB_DS_CLASS_C_DEC::
-erase_in_pos_imp(const_key_reference r_key, size_type pos)
+erase_in_pos_imp(key_const_reference r_key, size_type pos)
 {
   PB_DS_ASSERT_VALID((*this))
   entry_pointer p_e = m_entries[pos];
@@ -78,24 +78,23 @@ erase_in_pos_imp(const_key_reference r_key, size_type pos)
     {
       entry_pointer p_next_e = p_e->m_p_next;
       if (p_next_e == 0)
-        {
+       {
          resize_base::notify_erase_search_end();
          PB_DS_CHECK_KEY_DOES_NOT_EXIST(r_key)
-          PB_DS_ASSERT_VALID((*this))
-          return false;
-        }
+         PB_DS_ASSERT_VALID((*this))
+         return false;
+       }
 
       if (hash_eq_fn_base::operator()(PB_DS_V2F(p_next_e->m_value), r_key))
-        {
+       {
          resize_base::notify_erase_search_end();
          PB_DS_CHECK_KEY_EXISTS(r_key)
-          erase_entry_pointer(p_e->m_p_next);
+         erase_entry_pointer(p_e->m_p_next);
          do_resize_if_needed_no_throw();
          PB_DS_ASSERT_VALID((*this))
-          return true;
-        }
+         return true;
+       }
       resize_base::notify_erase_search_collision();
       p_e = p_next_e;
     }
 }
-