erase_store_hash_fn_imps.hpp: Formatting fixes.

[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 298c580c34e7d678ecf928e322667135e401c239..13a3a6d4d34af54309f95348199e9d3a433f0e93 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
@@ -41,8 +41,8 @@
 
 /**
  * @file erase_no_store_hash_fn_imps.hpp
- * Contains implementations of cc_ht_map_'s erase related functions, when the hash
- *    value is not stored.
+ * Contains implementations of cc_ht_map_'s erase related functions,
+ * when the hash value is not stored.
  */
 
 PB_DS_CLASS_T_DEC
@@ -51,9 +51,7 @@ PB_DS_CLASS_C_DEC::
 erase(const_key_reference r_key)
 {
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-    return (erase_in_pos_imp(r_key,
-                            ranged_hash_fn_base::operator()(r_key)));
+  return erase_in_pos_imp(r_key, ranged_hash_fn_base::operator()(r_key));
 }
 
 PB_DS_CLASS_T_DEC
@@ -62,77 +60,47 @@ PB_DS_CLASS_C_DEC::
 erase_in_pos_imp(const_key_reference r_key, size_type pos)
 {
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-    entry_pointer p_e = m_entries[pos];
-
+  entry_pointer p_e = m_entries[pos];
   resize_base::notify_erase_search_start();
-
   if (p_e == NULL)
     {
       resize_base::notify_erase_search_end();
-
-      _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(
-                                                             r_key);)
-
-        _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-        return (false);
+      _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(r_key);)
+      _GLIBCXX_DEBUG_ONLY(assert_valid();)
+      return false;
     }
 
-  if (hash_eq_fn_base::operator()(
-                                 PB_DS_V2F(p_e->m_value),
-                                 r_key))
+  if (hash_eq_fn_base::operator()(PB_DS_V2F(p_e->m_value), r_key))
     {
       resize_base::notify_erase_search_end();
-
-      _GLIBCXX_DEBUG_ONLY(map_debug_base::
-                    check_key_exists(r_key);)
-
-        erase_entry_pointer(m_entries[pos]);
-
+      _GLIBCXX_DEBUG_ONLY(map_debug_base:: check_key_exists(r_key);)
+      erase_entry_pointer(m_entries[pos]);
       do_resize_if_needed_no_throw();
-
       _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-        return (true);
+      return true;
     }
 
   while (true)
     {
       entry_pointer p_next_e = p_e->m_p_next;
-
       if (p_next_e == NULL)
         {
          resize_base::notify_erase_search_end();
-
-         _GLIBCXX_DEBUG_ONLY(map_debug_base::
-                        check_key_does_not_exist(r_key);)
-
-            _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-            return (false);
+         _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_does_not_exist(r_key);)
+          _GLIBCXX_DEBUG_ONLY(assert_valid();)
+          return false;
         }
 
-      if (hash_eq_fn_base::operator()(
-                                     PB_DS_V2F(p_next_e->m_value),
-                                     r_key))
+      if (hash_eq_fn_base::operator()(PB_DS_V2F(p_next_e->m_value), r_key))
         {
          resize_base::notify_erase_search_end();
-
-         _GLIBCXX_DEBUG_ONLY(map_debug_base::
-                        check_key_exists(r_key);)
-
-            erase_entry_pointer(p_e->m_p_next);
-
+         _GLIBCXX_DEBUG_ONLY(map_debug_base::check_key_exists(r_key);)
+          erase_entry_pointer(p_e->m_p_next);
          do_resize_if_needed_no_throw();
-
          _GLIBCXX_DEBUG_ONLY(assert_valid();)
-
-            return (true);
+          return true;
         }
-
       resize_base::notify_erase_search_collision();
-
       p_e = p_next_e;
     }
 }