summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-08-17 23:36:03 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-08-17 23:36:03 +0000
commit31f74e19b4cedc75f31d5044871a15b58ca38c5c (patch)
tree4f08ebb94e54804a3a8beb95349ff94678729a12 /ace
parent0b5eb81a00786c8793a51cdcc7554ad9d2f5170d (diff)
downloadATCD-31f74e19b4cedc75f31d5044871a15b58ca38c5c.tar.gz
ChangeLogTag:Sun Aug 17 16:35:01 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'ace')
-rw-r--r--ace/RB_Tree.cpp21
-rw-r--r--ace/RB_Tree.i18
2 files changed, 21 insertions, 18 deletions
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 5b5e0cabadd..5682971182e 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -18,7 +18,9 @@
#include "ace/Log_Msg.h"
-ACE_RCSID(ace, RB_Tree, "$Id$")
+ACE_RCSID (ace,
+ RB_Tree,
+ "$Id$")
// Constructor.
@@ -835,7 +837,6 @@ dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const
#endif /* ACE_HAS_DUMP */
}
-
/// Function to dump node itself. Does not show parameterized node contents
/// in its basic form, but template specialization can be used to
/// provide definitions for various EXT_ID and INT_ID types.
@@ -1064,6 +1065,20 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_
ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator_Base");
}
+// Dump the state of an object.
+
+template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
+void
+ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
+{
+ ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i");
+
+ ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+ ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnode_ = %x\n"), this->node_));
+ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+}
+
+
ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator)
// Constructor.
@@ -1111,7 +1126,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tre
}
template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree, ACE_RB_Tree_Node<EXT_ID, INT_ID>* entry)
+ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree, ACE_RB_Tree_Node<EXT_ID, INT_ID>* entry)
: ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (tree,entry)
{
ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator");
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index c442f8099e2..65ee125c62b 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -1,8 +1,10 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
// $Id$
#include "ace/Guard_T.h"
#include "ace/Malloc_Base.h"
+#include "ace/Log_Msg.h"
/////////////////////////////////////////////////////
// template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
@@ -819,20 +821,6 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (vo
}
-// Dump the state of an object.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
-{
- ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i");
-
- ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
- ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnode_ = %x\n"), this->node_));
- ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-
//////////////////////////////////////////////////////////////////
// template class //
// ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //