2007-09-06 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / pb_ds / detail / bin_search_tree_ / split_join_fn_imps.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
index ee7e2e8..6725604 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
@@ -50,37 +50,29 @@ PB_DS_CLASS_C_DEC::
 join_prep(PB_DS_CLASS_C_DEC& other)
 {
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
-    _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-    if (other.m_size == 0)
-      return (false);
+  _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+  if (other.m_size == 0)
+    return false;
 
   if (m_size == 0)
     {
       value_swap(other);
-
-      return (false);
+      return false;
     }
 
-  const bool greater = Cmp_Fn::operator()(
-                                         PB_DS_V2F(m_p_head->m_p_right->m_value),
-                                         PB_DS_V2F(other.m_p_head->m_p_left->m_value));
+  const bool greater = Cmp_Fn::operator()(PB_DS_V2F(m_p_head->m_p_right->m_value), PB_DS_V2F(other.m_p_head->m_p_left->m_value));
 
-  const bool lesser = Cmp_Fn::operator()(
-                                        PB_DS_V2F(other.m_p_head->m_p_right->m_value),
-                                        PB_DS_V2F(m_p_head->m_p_left->m_value));
+  const bool lesser = Cmp_Fn::operator()(PB_DS_V2F(other.m_p_head->m_p_right->m_value), PB_DS_V2F(m_p_head->m_p_left->m_value));
 
-  if (!greater&&  !lesser)
-    throw join_error();
+  if (!greater && !lesser)
+    __throw_join_error();
 
   if (lesser)
     value_swap(other);
 
   m_size += other.m_size;
-
-  _GLIBCXX_DEBUG_ONLY(map_debug_base::join(other);)
-
-    return (true);
+  _GLIBCXX_DEBUG_ONLY(debug_base::join(other);)
+  return true;
 }
 
 PB_DS_CLASS_T_DEC
@@ -89,7 +81,6 @@ PB_DS_CLASS_C_DEC::
 join_finish(PB_DS_CLASS_C_DEC& other)
 {
   initialize_min_max();
-
   other.initialize();
 }
 
@@ -99,53 +90,41 @@ PB_DS_CLASS_C_DEC::
 split_prep(const_key_reference r_key, PB_DS_CLASS_C_DEC& other)
 {
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
-    _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-    other.clear();
+  _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+  other.clear();
 
   if (m_size == 0)
     {
       _GLIBCXX_DEBUG_ONLY(assert_valid();)
-        _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-        return (false);
+      _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+      return false;
     }
 
   if (Cmp_Fn::operator()(r_key, PB_DS_V2F(m_p_head->m_p_left->m_value)))
     {
       value_swap(other);
-
       _GLIBCXX_DEBUG_ONLY(assert_valid();)
-        _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-        return (false);
+      _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+      return false;
     }
 
-  if (!Cmp_Fn::operator()(
-                         r_key,
-                         PB_DS_V2F(m_p_head->m_p_right->m_value)))
+  if (!Cmp_Fn::operator()(r_key, PB_DS_V2F(m_p_head->m_p_right->m_value)))
     {
       _GLIBCXX_DEBUG_ONLY(assert_valid();)
-        _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-        return (false);
+      _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+      return false;
     }
 
   if (m_size == 1)
     {
       value_swap(other);
-
       _GLIBCXX_DEBUG_ONLY(assert_valid();)
-        _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-
-        return (false);
+      _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+      return false;
     }
 
-  _GLIBCXX_DEBUG_ONLY(map_debug_base::split(
-                                      r_key,(Cmp_Fn& )(*this),
-                                      other);)
-
-    return (true);
+  _GLIBCXX_DEBUG_ONLY(debug_base::split(r_key,(Cmp_Fn& )(*this), other);)
+  return true;
 }
 
 PB_DS_CLASS_T_DEC
@@ -154,28 +133,20 @@ PB_DS_CLASS_C_DEC::
 split_finish(PB_DS_CLASS_C_DEC& other)
 {
   other.initialize_min_max();
-
-  other.m_size =
-    std::distance(other.begin(), other.end());
-
+  other.m_size = std::distance(other.begin(), other.end());
   m_size -= other.m_size;
-
   initialize_min_max();
-
   _GLIBCXX_DEBUG_ONLY(assert_valid();)
-    _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
-    }
+  _GLIBCXX_DEBUG_ONLY(other.assert_valid();)
+}
 
 PB_DS_CLASS_T_DEC
 typename PB_DS_CLASS_C_DEC::size_type
 PB_DS_CLASS_C_DEC::
-recursive_count(node_pointer p_nd) const
+recursive_count(node_pointer p) const
 {
-  if (p_nd == NULL)
-    return (0);
-
-  return (1 +
-         recursive_count(p_nd->m_p_left) +
-         recursive_count(p_nd->m_p_right));
+  if (p == NULL)
+    return 0;
+  return 1 + recursive_count(p->m_p_left) + recursive_count(p->m_p_right);
 }