2011-05-23 Benjamin Kosnik <bkoz@redhat.com>

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

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
index b152366..0356845 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
@@ -34,7 +34,7 @@
 // warranty.
 
 /**
- * @file splay_fn_imps.hpp
+ * @file splay_tree_/splay_fn_imps.hpp
  * Contains an implementation class for splay_tree_.
  */
 
@@ -56,32 +56,32 @@ splay(node_pointer p_nd)
 
       if (p_nd->m_p_parent->m_p_parent == base_type::m_p_head)
        {
-          base_type::rotate_parent(p_nd);
-          _GLIBCXX_DEBUG_ASSERT(p_nd == this->m_p_head->m_p_parent);
+         base_type::rotate_parent(p_nd);
+         _GLIBCXX_DEBUG_ASSERT(p_nd == this->m_p_head->m_p_parent);
        }
       else
        {
-          const node_pointer p_parent = p_nd->m_p_parent;
-          const node_pointer p_grandparent = p_parent->m_p_parent;
+         const node_pointer p_parent = p_nd->m_p_parent;
+         const node_pointer p_grandparent = p_parent->m_p_parent;
 
 #ifdef _GLIBCXX_DEBUG
-          const size_type total =
+         const size_type total =
            base_type::recursive_count(p_grandparent);
-          _GLIBCXX_DEBUG_ASSERT(total >= 3);
-#endif 
+         _GLIBCXX_DEBUG_ASSERT(total >= 3);
+#endif
 
-          if (p_parent->m_p_left == p_nd && 
+         if (p_parent->m_p_left == p_nd &&
              p_grandparent->m_p_right == p_parent)
            splay_zig_zag_left(p_nd, p_parent, p_grandparent);
-          else if (p_parent->m_p_right == p_nd && 
+         else if (p_parent->m_p_right == p_nd &&
                   p_grandparent->m_p_left == p_parent)
            splay_zig_zag_right(p_nd, p_parent, p_grandparent);
-          else if (p_parent->m_p_left == p_nd && 
+         else if (p_parent->m_p_left == p_nd &&
                   p_grandparent->m_p_left == p_parent)
            splay_zig_zig_left(p_nd, p_parent, p_grandparent);
-          else
+         else
            splay_zig_zig_right(p_nd, p_parent, p_grandparent);
-          _GLIBCXX_DEBUG_ASSERT(total ==this->recursive_count(p_nd));
+         _GLIBCXX_DEBUG_ASSERT(total ==this->recursive_count(p_nd));
        }
 
       PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd)
@@ -91,7 +91,7 @@ splay(node_pointer p_nd)
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent, 
+splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent,
                   node_pointer p_grandparent)
 {
   _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
@@ -99,8 +99,8 @@ splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent,
 
   PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
 
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd && 
-                       p_grandparent->m_p_right == p_parent);
+  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd &&
+                       p_grandparent->m_p_right == p_parent);
 
   splay_zz_start(p_nd, p_parent, p_grandparent);
 
@@ -127,7 +127,7 @@ splay_zig_zag_left(node_pointer p_nd, node_pointer p_parent,
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent, 
+splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent,
                    node_pointer p_grandparent)
 {
   _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
@@ -135,8 +135,8 @@ splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent,
 
   PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
 
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd && 
-                       p_grandparent->m_p_left == p_parent);
+  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd &&
+                       p_grandparent->m_p_left == p_parent);
 
   splay_zz_start(p_nd, p_parent, p_grandparent);
 
@@ -163,7 +163,7 @@ splay_zig_zag_right(node_pointer p_nd, node_pointer p_parent,
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent, 
+splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent,
                   node_pointer p_grandparent)
 {
   _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
@@ -171,7 +171,7 @@ splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent,
 
   PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
 
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd && 
+  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_left == p_nd &&
                     p_nd->m_p_parent->m_p_parent->m_p_left == p_nd->m_p_parent);
 
   splay_zz_start(p_nd, p_parent, p_grandparent);
@@ -199,14 +199,14 @@ splay_zig_zig_left(node_pointer p_nd, node_pointer p_parent,
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-splay_zig_zig_right(node_pointer p_nd, node_pointer p_parent, 
+splay_zig_zig_right(node_pointer p_nd, node_pointer p_parent,
                    node_pointer p_grandparent)
 {
   _GLIBCXX_DEBUG_ASSERT(p_parent == p_nd->m_p_parent);
   _GLIBCXX_DEBUG_ASSERT(p_grandparent == p_parent->m_p_parent);
   PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_grandparent)
-  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd && 
-                 p_nd->m_p_parent->m_p_parent->m_p_right == p_nd->m_p_parent);
+  _GLIBCXX_DEBUG_ASSERT(p_parent->m_p_right == p_nd &&
+                 p_nd->m_p_parent->m_p_parent->m_p_right == p_nd->m_p_parent);
 
   splay_zz_start(p_nd, p_parent, p_grandparent);
 
@@ -227,7 +227,7 @@ splay_zig_zig_right(node_pointer p_nd, node_pointer p_parent,
   if (p_c != 0)
     p_c->m_p_parent = p_grandparent;
 
-  base_type::update_to_top(p_grandparent, (node_update* )this);
+  base_type::update_to_top(p_grandparent, (node_update*)this);
   splay_zz_end(p_nd, p_parent, p_grandparent);
 }
 
@@ -237,7 +237,7 @@ PB_DS_CLASS_C_DEC::
 splay_zz_start(node_pointer p_nd,
 #ifdef _GLIBCXX_DEBUG
               node_pointer p_parent,
-#else 
+#else
               node_pointer /*p_parent*/,
 #endif
               node_pointer p_grandparent)
@@ -268,16 +268,14 @@ splay_zz_start(node_pointer p_nd,
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-splay_zz_end(node_pointer p_nd, node_pointer p_parent, 
+splay_zz_end(node_pointer p_nd, node_pointer p_parent,
             node_pointer p_grandparent)
 {
   if (p_nd->m_p_parent == base_type::m_p_head)
     base_type::m_p_head->m_p_parent = p_nd;
 
-  this->apply_update(p_grandparent, (node_update* )this);
-  this->apply_update(p_parent, (node_update* )this);
-  this->apply_update(p_nd, (node_update* )this);
-
+  this->apply_update(p_grandparent, (node_update*)this);
+  this->apply_update(p_parent, (node_update*)this);
+  this->apply_update(p_nd, (node_update*)this);
   PB_DS_ASSERT_BASE_NODE_CONSISTENT(p_nd)
 }
-