ChangeLogTag:Sat Mar 3 16:47:53 2001 Darrell Brunsch <brunsch@uci.edu>

author: brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-03-04 00:55:32 +0000
committer: brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-03-04 00:55:32 +0000
commit: 5d39a8906b66bef09613fb9651cc070bb01b29a6 (patch)
tree: 21940e84f154c881896f933dd3bc974ed67cf2f0
parent: 3b3c3d425a7fad3f2dff986629d8317961d3b08a (diff)
download: ATCD-5d39a8906b66bef09613fb9651cc070bb01b29a6.tar.gz
69 files changed, 444 insertions, 199 deletions
diff --git a/ChangeLog b/ChangeLog
index 46187f40860..59015632e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Changed the detection pattern a bit to pick up
+          stuff like:
+
+          void
+          operator < (...)
+
+          better.
+
+        * ace/Auto_Ptr.i:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Based_Pointer_T.i:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/DEV_Addr.i:
+        * ace/Dynamic.i:
+        * ace/FILE.cpp:
+        * ace/Flag_Manip.i:
+        * ace/Handle_Set.i:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Local_Tokens.cpp:
+        * ace/MEM_Addr.i:
+        * ace/Malloc.cpp:
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_T.cpp:
+        * ace/Memory_Pool.cpp:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block.i:
+        * ace/Message_Block_T.cpp:
+        * ace/Message_Queue.i:
+        * ace/Message_Queue_T.cpp:
+        * ace/Message_Queue_T.i:
+        * ace/Naming_Context.cpp:
+        * ace/OS.cpp:
+        * ace/OS.i:
+        * ace/PI_Malloc.cpp:
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/QtReactor.cpp:
+        * ace/RB_Tree.i:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Reactor.cpp:
+        * ace/Remote_Name_Space.cpp:
+        * ace/Remote_Tokens.cpp:
+        * ace/SOCK_Dgram.i:
+        * ace/SString.cpp:
+        * ace/SUN_Proactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Service_Object.i:
+        * ace/Service_Repository.cpp:
+        * ace/Signal.cpp:
+        * ace/Signal.i:
+        * ace/Svc_Handler.cpp:
+        * ace/Synch.cpp:
+        * ace/Synch_T.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Manager.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/TkReactor.cpp:
+        * ace/Token.cpp:
+        * ace/Token_Manager.cpp:
+        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
+        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * netsvcs/ACE-netsvcs.html:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/Token_Handler.cpp:
+
+          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
+
+        * docs/ACE-categories.html:
+        * docs/ACE-porting.html:
+        * docs/ACE-subsets.html:
+        * docs/tutorials/new-tutorials.html:
+
+          Changed references to 
+          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+          relative paths instead (Fixes the last of the fuzz errors).
+
 Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* include/makeinclude/platform_qnx_rtp_gcc.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 46187f40860..59015632e26 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,88 @@
+Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Changed the detection pattern a bit to pick up
+          stuff like:
+
+          void
+          operator < (...)
+
+          better.
+
+        * ace/Auto_Ptr.i:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Based_Pointer_T.i:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/DEV_Addr.i:
+        * ace/Dynamic.i:
+        * ace/FILE.cpp:
+        * ace/Flag_Manip.i:
+        * ace/Handle_Set.i:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Local_Tokens.cpp:
+        * ace/MEM_Addr.i:
+        * ace/Malloc.cpp:
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_T.cpp:
+        * ace/Memory_Pool.cpp:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block.i:
+        * ace/Message_Block_T.cpp:
+        * ace/Message_Queue.i:
+        * ace/Message_Queue_T.cpp:
+        * ace/Message_Queue_T.i:
+        * ace/Naming_Context.cpp:
+        * ace/OS.cpp:
+        * ace/OS.i:
+        * ace/PI_Malloc.cpp:
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/QtReactor.cpp:
+        * ace/RB_Tree.i:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Reactor.cpp:
+        * ace/Remote_Name_Space.cpp:
+        * ace/Remote_Tokens.cpp:
+        * ace/SOCK_Dgram.i:
+        * ace/SString.cpp:
+        * ace/SUN_Proactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Service_Object.i:
+        * ace/Service_Repository.cpp:
+        * ace/Signal.cpp:
+        * ace/Signal.i:
+        * ace/Svc_Handler.cpp:
+        * ace/Synch.cpp:
+        * ace/Synch_T.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Manager.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/TkReactor.cpp:
+        * ace/Token.cpp:
+        * ace/Token_Manager.cpp:
+        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
+        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * netsvcs/ACE-netsvcs.html:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/Token_Handler.cpp:
+
+          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
+
+        * docs/ACE-categories.html:
+        * docs/ACE-porting.html:
+        * docs/ACE-subsets.html:
+        * docs/tutorials/new-tutorials.html:
+
+          Changed references to 
+          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+          relative paths instead (Fixes the last of the fuzz errors).
+
 Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* include/makeinclude/platform_qnx_rtp_gcc.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 46187f40860..59015632e26 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,88 @@
+Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/fuzz.pl:
+
+          Changed the detection pattern a bit to pick up
+          stuff like:
+
+          void
+          operator < (...)
+
+          better.
+
+        * ace/Auto_Ptr.i:
+        * ace/Base_Thread_Adapter.cpp:
+        * ace/Based_Pointer_T.i:
+        * ace/Connector.cpp:
+        * ace/Containers_T.cpp:
+        * ace/DEV_Addr.i:
+        * ace/Dynamic.i:
+        * ace/FILE.cpp:
+        * ace/Flag_Manip.i:
+        * ace/Handle_Set.i:
+        * ace/Hash_Map_Manager_T.cpp:
+        * ace/Lib_Find.cpp:
+        * ace/Local_Name_Space_T.cpp:
+        * ace/Local_Tokens.cpp:
+        * ace/MEM_Addr.i:
+        * ace/Malloc.cpp:
+        * ace/Malloc_Allocator.cpp:
+        * ace/Malloc_T.cpp:
+        * ace/Memory_Pool.cpp:
+        * ace/Message_Block.cpp:
+        * ace/Message_Block.i:
+        * ace/Message_Block_T.cpp:
+        * ace/Message_Queue.i:
+        * ace/Message_Queue_T.cpp:
+        * ace/Message_Queue_T.i:
+        * ace/Naming_Context.cpp:
+        * ace/OS.cpp:
+        * ace/OS.i:
+        * ace/PI_Malloc.cpp:
+        * ace/POSIX_Asynch_IO.cpp:
+        * ace/Process_Manager.cpp:
+        * ace/QtReactor.cpp:
+        * ace/RB_Tree.i:
+        * ace/RW_Process_Mutex.cpp:
+        * ace/Reactor.cpp:
+        * ace/Remote_Name_Space.cpp:
+        * ace/Remote_Tokens.cpp:
+        * ace/SOCK_Dgram.i:
+        * ace/SString.cpp:
+        * ace/SUN_Proactor.cpp:
+        * ace/Select_Reactor_Base.cpp:
+        * ace/Select_Reactor_T.cpp:
+        * ace/Service_Object.i:
+        * ace/Service_Repository.cpp:
+        * ace/Signal.cpp:
+        * ace/Signal.i:
+        * ace/Svc_Handler.cpp:
+        * ace/Synch.cpp:
+        * ace/Synch_T.cpp:
+        * ace/Thread_Adapter.cpp:
+        * ace/Thread_Manager.cpp:
+        * ace/Timer_Heap_T.cpp:
+        * ace/TkReactor.cpp:
+        * ace/Token.cpp:
+        * ace/Token_Manager.cpp:
+        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
+        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * netsvcs/ACE-netsvcs.html:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/Token_Handler.cpp:
+
+          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
+
+        * docs/ACE-categories.html:
+        * docs/ACE-porting.html:
+        * docs/ACE-subsets.html:
+        * docs/tutorials/new-tutorials.html:
+
+          Changed references to 
+          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
+          relative paths instead (Fixes the last of the fuzz errors).
+
 Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	* include/makeinclude/platform_qnx_rtp_gcc.GNU:
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index 2dca307b97a..7fba5b4edfa 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -92,7 +92,7 @@ ACE_Auto_Basic_Array_Ptr<X>::release (void)
 template<class X> ACE_INLINE void
 ACE_Auto_Basic_Array_Ptr<X>::reset (X *p)
 {
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::reset");
+  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::reset");
   if (this->get () != p)
     delete [] this->get ();
   this->p_ = p;
diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp
index d528222a550..2f8efd4e58f 100644
--- a/ace/Base_Thread_Adapter.cpp
+++ b/ace/Base_Thread_Adapter.cpp
@@ -87,7 +87,8 @@ ACE_Base_Thread_Adapter::thr_desc_log_msg (void)
 // be an extern "C" to make certain compilers happy...
 
 #if defined (ACE_PSOS)
-extern "C" void ace_thread_adapter (unsigned long args)
+extern "C" void 
+ace_thread_adapter (unsigned long args)
 {
   ACE_OS_TRACE ("ace_thread_adapter");
 
@@ -106,7 +107,8 @@ extern "C" void ace_thread_adapter (unsigned long args)
   thread_args->invoke ();
 }
 #else /* ! defined (ACE_PSOS) */
-extern "C" void * ace_thread_adapter (void *args)
+extern "C" void * 
+ace_thread_adapter (void *args)
 {
   ACE_OS_TRACE ("ace_thread_adapter");
 
diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.i
index a557c558081..1d99f9ecaa8 100644
--- a/ace/Based_Pointer_T.i
+++ b/ace/Based_Pointer_T.i
@@ -13,7 +13,7 @@ ACE_Based_Pointer<CONCRETE>::operator->(void)
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator =");
   if (rhs == 0)
     // Store a value of <target_> that indicate "NULL" pointer.
     this->target_ = -1;
@@ -25,7 +25,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer<CONCRETE>::operator = (CONCRETE *rhs)
 {
-  ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::operator=");
+  ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::operator =");
   if (rhs == 0)
     // Store a value of <target_> that indicate "NULL" pointer.
     this->target_ = -1;
@@ -45,7 +45,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator *(void) const
 template <class CONCRETE> ACE_INLINE CONCRETE *
 ACE_Based_Pointer_Basic<CONCRETE>::addr (void) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator CONCRETE *()");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::addr");
 
   if (this->target_ == -1)
     return 0;
@@ -65,7 +65,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator CONCRETE *() const
 template <class CONCRETE> ACE_INLINE CONCRETE
 ACE_Based_Pointer_Basic<CONCRETE>::operator [] (int index) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator[]");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator []");
   CONCRETE *c = ACE_reinterpret_cast (CONCRETE *,
                                       ACE_COMPUTE_BASED_POINTER (this));
   return c[index];
@@ -74,49 +74,49 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator [] (int index) const
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer_Basic<CONCRETE>::operator += (int index)
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator+=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator +=");
   this->base_offset_ += (index * sizeof (CONCRETE));
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator == (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator==");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator ==");
   return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator != (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator!=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator !=");
   return !(*this == rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator < (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator<");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator <");
   return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator<=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator <=");
   return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator > (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator>");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator >");
   return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator>=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator >=");
   return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.i b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
index dcb6a0d2862..d15dedd007d 100644
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.i
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
@@ -7,7 +7,7 @@ ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (ACE_Reactor* theReactor)
     : port_    (0),
       reactor_ (theReactor)
 {
-  ACE_TRACE ("ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor");
+  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor");
 }
 
 ACE_INLINE
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
index 13716a5d351..960e76358aa 100644
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
@@ -150,7 +150,7 @@ ACE_CLASSIX_Select_Reactor::handle_error_ (int thePort)
 int
 ACE_CLASSIX_Select_Reactor::check_handles_ (int thePort)
 {
-    ACE_TRACE ("ACE_Select_Reactor::check_handles");
+    ACE_TRACE ("ACE_CLASSIX_Select_Reactor::check_handles_");
     if (thePort == K_ANYENABLED)
 	return -1;
     else
@@ -220,7 +220,7 @@ ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications (
     int & number_of_active_handles,
     const ACE_Handle_Set &rd_mask)
 {
-  ACE_TRACE ("(%t) ACE_Select_Reactor_Notify::handle_notification");
+  ACE_TRACE ("(%t) ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications");
 
   ACE_HANDLE read_handle =
       this->notification_sap_.get_handle ();
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 0544196ce59..15eef258692 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -416,7 +416,7 @@ ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
                                        int flags,
                                        int perms)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect_i");
 
   // If the user hasn't supplied us with a <SVC_HANDLER> we'll use the
   // factory method to create one.  Otherwise, things will remain as
@@ -737,7 +737,7 @@ ACE_Connector<SH, PR_CO_2>::~ACE_Connector (void)
 template <class SH, PR_CO_1> int
 ACE_Strategy_Connector<SH, PR_CO_2>::open (ACE_Reactor *r, int flags)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::open");
+  ACE_TRACE ("ACE_Strategy_Connector<SH, PR_CO_2>::open");
   return this->open (r, 0, 0, 0, flags);
 }
 
@@ -749,7 +749,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open
    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
    int flags)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::open");
+  ACE_TRACE ("ACE_Strategy_Connector<SH, PR_CO_2>::open");
 
   this->reactor (r);
 
@@ -839,7 +839,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::ACE_Strategy_Connector
       concurrency_strategy_ (0),
       delete_concurrency_strategy_ (0)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::ACE_Connector");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::ACE_Strategy_Connector");
 
   if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector")));
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 02e90016df7..5326b8f1ad3 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -469,7 +469,7 @@ ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
+  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
 
   ACE_Node<T> *temp;
 
@@ -490,7 +490,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
+  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
 
   ACE_Node<T> *temp;
 
@@ -1724,7 +1724,7 @@ ACE_Unbounded_Set<T>::size (void) const
 template <class T> int
 ACE_Unbounded_Set<T>::insert_tail (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
+  // ACE_TRACE ("ACE_Unbounded_Set<T>::insert_tail");
   ACE_Node<T> *temp;
 
   // Insert <item> into the old dummy node location.
@@ -1873,7 +1873,7 @@ ACE_Unbounded_Set<T>::operator= (const ACE_Unbounded_Set<T> &us)
 template <class T> int
 ACE_Unbounded_Set<T>::find (const T &item) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
+  // ACE_TRACE ("ACE_Unbounded_Set<T>::find");
   // Set <item> into the dummy node.
   this->head_->item_ = item;
 
@@ -2254,7 +2254,7 @@ template <class T> int
 ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position,
                                       ACE_DNode<T> **new_position)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
+  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert_from");
 
   // create a new node
   ACE_DNode<T> *temp;
diff --git a/ace/DEV_Addr.i b/ace/DEV_Addr.i
index 7ada0c3dd18..3a7ad769e24 100644
--- a/ace/DEV_Addr.i
+++ b/ace/DEV_Addr.i
@@ -38,7 +38,7 @@ ACE_DEV_Addr::get_addr (void) const
 ACE_INLINE int
 ACE_DEV_Addr::operator == (const ACE_DEV_Addr &sap) const
 {
-  ACE_TRACE ("ACE_DEV_Addr::operator=");
+  ACE_TRACE ("ACE_DEV_Addr::operator ==");
 
   return ACE_OS::strcmp (this->devname_, sap.devname_) == 0;
 }
@@ -48,7 +48,7 @@ ACE_DEV_Addr::operator == (const ACE_DEV_Addr &sap) const
 ACE_INLINE int
 ACE_DEV_Addr::operator != (const ACE_DEV_Addr &sap) const
 {
-  ACE_TRACE ("ACE_DEV_Addr::operator!=");
+  ACE_TRACE ("ACE_DEV_Addr::operator !=");
 
   return !((*this) == sap);	// This is lazy, of course... ;-).
 }
diff --git a/ace/Dynamic.i b/ace/Dynamic.i
index 6a32b94d4e6..5b25ac54f55 100644
--- a/ace/Dynamic.i
+++ b/ace/Dynamic.i
@@ -26,7 +26,7 @@ ACE_Dynamic::is_dynamic ()
 ACE_INLINE void
 ACE_Dynamic::reset (void)
 { 
-  ACE_TRACE ("ACE_Dynamic::set");
+  ACE_TRACE ("ACE_Dynamic::reset");
   this->is_dynamic_ = 0; 
 }
 
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index e6e5445f6a8..1c031eaa049 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -91,7 +91,7 @@ ACE_FILE::position (long offset, int startpos)
 off_t
 ACE_FILE::tell (void)
 {
-  ACE_TRACE ("ACE_FILE::position");
+  ACE_TRACE ("ACE_FILE::tell");
   return ACE_OS::lseek (this->get_handle (), 0, SEEK_CUR);
 }
 
diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.i
index e477f235d23..b041e1f19d8 100644
--- a/ace/Flag_Manip.i
+++ b/ace/Flag_Manip.i
@@ -6,7 +6,7 @@
 ASYS_INLINE int
 ACE_Flag_Manip::get_flags (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE::get_flags");
+  ACE_TRACE ("ACE_Flag_Manip::get_flags");
 
 #if defined (ACE_LACKS_FCNTL)
   // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i
index ae775b907cc..ac7e837c2d9 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.i
@@ -31,9 +31,9 @@ ACE_Handle_Set::reset (void)
 
 #if defined (ACE_HAS_BIG_FD_SET)
 ACE_INLINE ACE_Handle_Set &
-ACE_Handle_Set::operator= (const ACE_Handle_Set &rhs)
+ACE_Handle_Set::operator = (const ACE_Handle_Set &rhs)
 {
-  ACE_TRACE ("ACE_Handle_Set::reset");
+  ACE_TRACE ("ACE_Handle_Set::operator =");
 
   if (rhs.size_ > 0)
     {
@@ -147,7 +147,7 @@ ACE_Handle_Set::num_set (void) const
 ACE_INLINE
 ACE_Handle_Set::operator fd_set *()
 {
-  ACE_TRACE ("ACE_Handle_Set::operator ACE_FD_SET_TYPE *");
+  ACE_TRACE ("ACE_Handle_Set::operator fd_set *");
 
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
@@ -160,7 +160,7 @@ ACE_Handle_Set::operator fd_set *()
 ACE_INLINE fd_set *
 ACE_Handle_Set::fdset (void)
 {
-  ACE_TRACE ("ACE_Handle_Set::operator ACE_FD_SET_TYPE *");
+  ACE_TRACE ("ACE_Handle_Set::fdset");
 
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index c692077bd95..dbab8a02a2c 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -375,7 +375,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Base_Ex)
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
 ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
 {
-  ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
+  ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("index_ = %d "), this->index_));
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index edda500268a..51765c1cb93 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -539,7 +539,7 @@ ACE_Lib_Find::strsplit_r (wchar_t *str,
 size_t
 ACE_Lib_Find::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
 {
-  ACE_TRACE ("ACE::strrepl");
+  ACE_TRACE ("ACE_Lib_Find::strrepl");
 
   size_t replaced = 0;
 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 35e8371d153..7747e690076 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -80,7 +80,7 @@ ACE_Name_Space_Map<ALLOCATOR>::find (const ACE_NS_String &ext_id,
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::remap (EXCEPTION_POINTERS *ep)
 {
-  ACE_TRACE ("ACE_Name_Space_Map::remap");
+  ACE_TRACE ("ACE_Local_Name_Space::remap");
 
   void *addr = (void *) ep->ExceptionRecord->ExceptionInformation[1];
 
@@ -131,7 +131,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i (const ACE_WString
                                                            int rebind)
 {
 
-  ACE_TRACE ("ACE_Local_Name_Space::shared_bind");
+  ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i");
   size_t name_len = (name.length () + 1) * sizeof (ACE_USHORT16);
   size_t value_len = (value.length () + 1) * sizeof (ACE_USHORT16);
   size_t type_len = ACE_OS::strlen (type) + 1;
@@ -223,7 +223,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const ACE_WString &name)
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind_i (const ACE_WString &name)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::unbind");
+  ACE_TRACE ("ACE_Local_Name_Space::unbind_i");
 
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
   ACE_NS_String ns_name (name);
@@ -288,7 +288,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (const ACE_WString &na
                                                            ACE_WString &value,
                                                            char *&type)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::resolve");
+  ACE_TRACE ("ACE_Local_Name_Space::resolve_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   ACE_NS_String ns_name (name);
@@ -383,7 +383,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void)
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::create_manager");
+  ACE_TRACE ("ACE_Local_Name_Space::create_manager_i");
   // Get directory name
   const ACE_TCHAR *dir = this->name_options_->namespace_dir ();
   const ACE_TCHAR *database = this->name_options_->database ();
@@ -511,7 +511,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names_i (ACE_PWSTRING_SET &set,
                                                               const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_names");
+  ACE_TRACE ("ACE_Local_Name_Space::list_names_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -544,7 +544,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values_i (ACE_PWSTRING_SET &set,
                                                            const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_values");
+  ACE_TRACE ("ACE_Local_Name_Space::list_values_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -577,7 +577,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types_i (ACE_PWSTRING_SET &set,
                                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_types");
+  ACE_TRACE ("ACE_Local_Name_Space::list_types_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -647,7 +647,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space <ACE_MEM_POOL_2, ACE_LOCK>::list_name_entries_i (ACE_BINDING_SET &set,
                                                                       const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_name_entries");
+  ACE_TRACE ("ACE_Local_Name_Space::list_name_entries_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -675,7 +675,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_value_entries_i (ACE_BINDING_SET &set,
                                                                   const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_value_entries");
+  ACE_TRACE ("ACE_Local_Name_Space::list_value_entries_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -702,7 +702,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries_i (ACE_BINDING_SET &set,
                                                                  const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_type_entries");
+  ACE_TRACE ("ACE_Local_Name_Space::list_type_entries_i");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -756,7 +756,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries_i (ACE_BINDING
 template <ACE_MEM_POOL_1, class ACE_LOCK> void
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
 {
-  ACE_TRACE ("ACE_Local_Name_Space::dump");
+  ACE_TRACE ("ACE_Local_Name_Space::dump_i");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 8e4a3d55038..0487fb45c71 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -915,7 +915,7 @@ ACE_RW_Token::release (ACE_TPQ_Entry *caller)
 void
 ACE_RW_Token::notify_new_owner (ACE_TPQ_Entry *old_owner)
 {
-  ACE_TRACE ("ACE_RW_Token::new_owner");
+  ACE_TRACE ("ACE_RW_Token::notify_new_owner");
 
   if (this->owner () == 0)
     return;
@@ -1017,7 +1017,7 @@ ACE_RW_Token::is_waiting_for (const ACE_TCHAR *id)
 int
 ACE_RW_Token::is_owner (const ACE_TCHAR *id)
 {
-  ACE_TRACE ("ACE_Mutex_Token::is_owner");
+  ACE_TRACE ("ACE_RW_Token::is_owner");
   // If there is no owner, return false.
   if (this->owner () == 0)
     return 0;
@@ -1097,7 +1097,7 @@ ACE_Token_Proxy::owner_id (void)
 const ACE_TCHAR *
 ACE_Token_Proxy::name (void) const
 {
-  ACE_TRACE ("ACE_Token_Proxy::owner_id");
+  ACE_TRACE ("ACE_Token_Proxy::name");
   return this->token_->name ();
 }
 
@@ -1122,7 +1122,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
 // @@ should I do a mutex_->release ()?
 ACE_Token_Proxy::~ACE_Token_Proxy (void)
 {
-  ACE_TRACE ("ACE_Local_Mutex::~ACE_Local_Mutex");
+  ACE_TRACE ("ACE_Token_Proxy::~ACE_Token_Proxy");
 
   if (token_ != 0)
     // notify token manager that we are done with it so it can
diff --git a/ace/MEM_Addr.i b/ace/MEM_Addr.i
index 73cb2af2e05..e2cb980a34b 100644
--- a/ace/MEM_Addr.i
+++ b/ace/MEM_Addr.i
@@ -24,7 +24,7 @@ ACE_MEM_Addr::set_port_number (u_short port_number,
 ACE_INLINE int
 ACE_MEM_Addr::set (u_short port_number, int encode)
 {
-  ACE_TRACE ("ACE_INET_Addr::set");
+  ACE_TRACE ("ACE_MEM_Addr::set");
   this->set_port_number (port_number, encode);
   return 0;
 }
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 52b2ebf0568..1033462eb48 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -25,7 +25,7 @@ int ACE_Allocator::delete_allocator_ = 0;
 void
 ACE_Control_Block::ACE_Malloc_Header::dump (void) const
 {
-  ACE_TRACE ("ACE_Malloc_Header::dump");
+  ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
@@ -94,7 +94,7 @@ ACE_Control_Block::dump (void) const
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
 }
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
@@ -106,7 +106,7 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
     next_ (next),
     prev_ (0)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
   char *n = this->name_;
   ACE_OS::strcpy (n, name);
   if (next != 0)
@@ -115,7 +115,7 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
 #if !defined (ACE_PSOS)
   ACE_ASSERT (!"not implemented!");
 #endif /* ! ACE_PSOS */
@@ -145,7 +145,7 @@ ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_Control_Block::ACE_Name_Node::dump (void) const
 {
-  ACE_TRACE ("ACE_Name_Node");
+  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %x"), (const char *) this->pointer_));
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index 2b6f170b5fa..43827a958d7 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -125,7 +125,7 @@ ACE_Allocator::ACE_Allocator (void)
 void
 ACE_Static_Allocator_Base::dump (void) const
 {
-  ACE_TRACE ("ACE_Static_Base_Allocator::dump");
+  ACE_TRACE ("ACE_Static_Allocator_Base::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noffset_ = %d"), this->offset_));
@@ -148,7 +148,7 @@ ACE_Malloc_Stats::ACE_Malloc_Stats (void)
 void
 ACE_Malloc_Stats::dump (void) const
 {
-  ACE_TRACE ("ACE_Malloc_Stats::print");
+  ACE_TRACE ("ACE_Malloc_Stats::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   int nblocks = this->nblocks_.value ();
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 971fa37f8e9..a8ed0dc2679 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -83,7 +83,7 @@ ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void)
 template <class MALLOC> void
 ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 {
-  ACE_TRACE ("ACE_Allocator_Adaptor<MALLOC>::print_stats");
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::print_stats");
   this->allocator_.print_stats ();
 }
 #endif /* ACE_HAS_MALLOC_STATS */
@@ -91,7 +91,7 @@ ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 template <class MALLOC> void
 ACE_Allocator_Adapter<MALLOC>::dump (void) const
 {
-  ACE_TRACE ("ACE_Malloc<MALLOC>::dump");
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::dump");
   this->allocator_.dump ();
 }
 
@@ -743,7 +743,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_It
     guard_ (malloc_.lock_),
     name_ (name != 0 ? ACE_OS::strdup (name) : 0)
 {
-  ACE_TRACE ("ACE_Malloc_LIFO_Iterator<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_Iterator");
+  ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_Iterator_T");
   // Cheap trick to make code simple.
   // @@ Doug, this looks like trouble...
   NAME_NODE temp;
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index f691888c0eb..ea4fb3bc79b 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -674,7 +674,7 @@ int
 ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                                                    off_t &offset)
 {
-  ACE_TRACE ("ACE_Shared_Memory_Pool::update");
+  ACE_TRACE ("ACE_Shared_Memory_Pool::commit_backing_store_name");
 
   size_t counter;
   SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index ce9ae206bb0..990066ebf35 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -248,7 +248,7 @@ ACE_Message_Block::total_length (void) const
 size_t
 ACE_Message_Block::total_capacity (void) const
 {
-  ACE_TRACE ("ACE_Message_Block::total_size");
+  ACE_TRACE ("ACE_Message_Block::total_capacity");
 
   size_t size = 0;
 
diff --git a/ace/Message_Block.i b/ace/Message_Block.i
index 19774477da1..4989478c6db 100644
--- a/ace/Message_Block.i
+++ b/ace/Message_Block.i
@@ -73,7 +73,7 @@ ACE_Data_Block::flags (void) const
 ACE_INLINE ACE_Allocator*
 ACE_Data_Block::data_block_allocator (void) const
 {
-  ACE_TRACE ("ACE_Message_Block::data_block_allocator");
+  ACE_TRACE ("ACE_Data_Block::data_block_allocator");
   return this->data_block_allocator_;
 }
 
diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp
index 05d483392b6..4916fd211e7 100644
--- a/ace/Message_Block_T.cpp
+++ b/ace/Message_Block_T.cpp
@@ -18,7 +18,7 @@ ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void)
 template<class ACE_LOCK> ACE_Data_Block *
 ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags mask) const
 {
-  ACE_TRACE ("ACE_Data_Block::clone");
+  ACE_TRACE ("ACE_Locked_Data_Block::clone_nocopy");
 
   // You always want to clear this one to prevent memory leaks but you
   // might add some others later.
diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i
index 07b15edfef5..b1afcc649d2 100644
--- a/ace/Message_Queue.i
+++ b/ace/Message_Queue.i
@@ -75,7 +75,7 @@ ACE_Message_Queue_Vx::message_bytes (void)
 ACE_INLINE size_t
 ACE_Message_Queue_Vx::message_length (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
+  ACE_TRACE ("ACE_Message_Queue_Vx::message_length");
   ACE_NOTSUP_RETURN ((size_t) -1);
 }
 
@@ -91,14 +91,14 @@ ACE_Message_Queue_Vx::message_count (void)
 ACE_INLINE void
 ACE_Message_Queue_Vx::message_bytes (size_t)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes");
+  ACE_TRACE ("ACE_Message_Queue_Vx::message_bytes");
   ACE_NOTSUP;
 }
 
 ACE_INLINE void
 ACE_Message_Queue_Vx::message_length (size_t)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
+  ACE_TRACE ("ACE_Message_Queue_Vx::message_length");
   ACE_NOTSUP;
 }
 
@@ -148,7 +148,7 @@ ACE_Message_Queue_NT::message_bytes (void)
 ACE_INLINE size_t
 ACE_Message_Queue_NT::message_length (void)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
+  ACE_TRACE ("ACE_Message_Queue_NT::message_length");
   // Accessing to size_t must be atomic.
   return this->cur_length_;
 }
@@ -164,7 +164,7 @@ ACE_Message_Queue_NT::message_count (void)
 ACE_INLINE void
 ACE_Message_Queue_NT::message_bytes (size_t new_value)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes");
+  ACE_TRACE ("ACE_Message_Queue_NT::message_bytes");
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
 
   this->cur_bytes_ = new_value;
@@ -173,7 +173,7 @@ ACE_Message_Queue_NT::message_bytes (size_t new_value)
 ACE_INLINE void
 ACE_Message_Queue_NT::message_length (size_t new_value)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
+  ACE_TRACE ("ACE_Message_Queue_NT::message_length");
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
 
   this->cur_length_ = new_value;
@@ -189,7 +189,7 @@ ACE_Message_Queue_NT::max_threads (void)
 ACE_INLINE int
 ACE_Message_Queue_NT::deactivated (void)
 {
-  ACE_TRACE ("ACE_Message_Queue_NT::ceactivated");
+  ACE_TRACE ("ACE_Message_Queue_NT::deactivated");
   // Accessing to int must be atomic.
   return this->deactivated_;
 }
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 113c1538ac6..9ac3857896b 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -137,7 +137,7 @@ template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> int
 ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_prio (ACE_MESSAGE_TYPE *new_item,
                                                                      ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue");
+  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_prio");
 
   ACE_Message_Block *mb;
 
diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.i
index 7250dc9ddd2..e8923783001 100644
--- a/ace/Message_Queue_T.i
+++ b/ace/Message_Queue_T.i
@@ -5,7 +5,7 @@ template <ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Message_Queue<ACE_SYNCH_USE>::dequeue (ACE_Message_Block *&first_item,
                                            ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue");
   return this->dequeue_head (first_item, timeout);
 }
 
@@ -171,7 +171,7 @@ template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue (ACE_MESSAGE_TYPE *&first_item,
                                                                 ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy");
+  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue");
 
   return this->queue_.dequeue (first_item, timeout);
 }
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 4f9e28b7a5f..91eda1b7d30 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -511,7 +511,7 @@ ACE_Name_Options::database (const ACE_TCHAR *db)
 char *
 ACE_Name_Options::base_address (void)
 {
-  ACE_TRACE ("ACE_Name_Options::database");
+  ACE_TRACE ("ACE_Name_Options::base_address");
   return this->base_address_;
 }
 
diff --git a/ace/OS.cpp b/ace/OS.cpp
index f86589de11b..5b70ab494d8 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -1578,9 +1578,9 @@ ACE_TSS_Ref::operator== (const ACE_TSS_Ref &info) const
 // Check for inequality.
 ACE_SPECIAL_INLINE
 int
-ACE_TSS_Ref::operator!= (const ACE_TSS_Ref &tss_ref) const
+ACE_TSS_Ref::operator != (const ACE_TSS_Ref &tss_ref) const
 {
-  ACE_OS_TRACE ("ACE_TSS_Ref::operator==");
+  ACE_OS_TRACE ("ACE_TSS_Ref::operator !=");
 
   return !(*this == tss_ref);
 }
@@ -1634,9 +1634,9 @@ ACE_TSS_Info::operator== (const ACE_TSS_Info &info) const
 
 // Check for inequality.
 int
-ACE_TSS_Info::operator!= (const ACE_TSS_Info &info) const
+ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const
 {
-  ACE_OS_TRACE ("ACE_TSS_Info::operator==");
+  ACE_OS_TRACE ("ACE_TSS_Info::operator !=");
 
   return !(*this == info);
 }
@@ -4482,7 +4482,7 @@ ACE_OS::write_n (ACE_HANDLE handle,
 int
 ACE_OS::writev_emulation (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
 {
-  ACE_OS_TRACE ("::writev");
+  ACE_OS_TRACE ("ACE_OS::writev_emulation");
 
   size_t length = 0;
   int i;
@@ -4530,7 +4530,7 @@ ACE_OS::readv_emulation (ACE_HANDLE handle,
                          ACE_READV_TYPE *iov,
                          int n)
 {
-  ACE_OS_TRACE ("readv");
+  ACE_OS_TRACE ("ACE_OS::readv_emulation");
 
   ssize_t length = 0;
   int i;
diff --git a/ace/OS.i b/ace/OS.i
index e18992fd756..aa1f5e8962e 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -147,7 +147,7 @@ ACE_Time_Value::operator timeval () const
 ACE_INLINE
 ACE_Time_Value::operator const timeval * () const
 {
-  ACE_OS_TRACE ("ACE_Time_Value::operator timeval");
+  ACE_OS_TRACE ("ACE_Time_Value::operator const timeval *");
   return (const timeval *) &this->tv_;
 }
 
@@ -2575,7 +2575,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg)
 ACE_INLINE int
 ACE_OS::cond_signal (ACE_cond_t *cv)
 {
-ACE_OS_TRACE ("ACE_OS::cond_signal");
+  ACE_OS_TRACE ("ACE_OS::cond_signal");
 #if defined (ACE_HAS_PACE)
   ACE_OSCALL_RETURN (::pace_pthread_cond_signal (cv), int, -1);
 # elif defined (ACE_HAS_THREADS)
@@ -2601,7 +2601,7 @@ ACE_OS_TRACE ("ACE_OS::cond_signal");
 ACE_INLINE int
 ACE_OS::cond_broadcast (ACE_cond_t *cv)
 {
-ACE_OS_TRACE ("ACE_OS::cond_broadcast");
+  ACE_OS_TRACE ("ACE_OS::cond_broadcast");
 #if defined (ACE_HAS_PACE)
   ACE_OSCALL_RETURN (::pace_pthread_cond_broadcast (cv), int, -1);
 # elif defined (ACE_HAS_THREADS)
@@ -3019,7 +3019,7 @@ ACE_OS::recursive_mutex_unlock (ACE_recursive_thread_mutex_t *m)
 #if defined (ACE_HAS_RECURSIVE_MUTEXES)
   return ACE_OS::thread_mutex_unlock (m);
 #else
-ACE_OS_TRACE ("ACE_Recursive_Thread_Mutex::release");
+  ACE_OS_TRACE ("ACE_OS::recursive_mutex_unlock");
 #if !defined (ACE_NDEBUG)
   ACE_thread_t t_id = ACE_OS::thr_self ();
 #endif /* ACE_NDEBUG */
@@ -4429,7 +4429,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw)
 {
-  ACE_OS_TRACE ("ACE_OS::rw_wrlock");
+  ACE_OS_TRACE ("ACE_OS::rw_trywrlock_upgrade");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   // Some native rwlocks, such as those on Solaris and HP-UX 11, don't
@@ -8680,7 +8680,7 @@ ACE_OS::filesize (const ACE_TCHAR *filename)
 ACE_INLINE int
 ACE_OS::closesocket (ACE_HANDLE handle)
 {
-  ACE_OS_TRACE ("ACE_OS::close");
+  ACE_OS_TRACE ("ACE_OS::closesocket");
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::closesocket ((SOCKET) handle), int, -1);
 #elif defined (ACE_PSOS_DIAB_PPC)
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
index b514714875c..e27f3d1f6a8 100644
--- a/ace/PI_Malloc.cpp
+++ b/ace/PI_Malloc.cpp
@@ -27,7 +27,7 @@ ACE_RCSID(ace, PI_Malloc, "$Id$")
 void
 ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 {
-  ACE_TRACE ("ACE_Malloc_Header::dump");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
@@ -38,7 +38,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 void
 ACE_PI_Control_Block::print_alignment_info (void)
 {
-  ACE_TRACE ("ACE_Control_Block::print_alignment_info");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info");
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("Sizeof ptr: %d\n")
@@ -72,7 +72,7 @@ ACE_PI_Control_Block::print_alignment_info (void)
 void
 ACE_PI_Control_Block::dump (void) const
 {
-  ACE_TRACE ("ACE_Control_Block::dump");
+  ACE_TRACE ("ACE_PI_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n")));
@@ -96,7 +96,7 @@ ACE_PI_Control_Block::dump (void) const
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
 }
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
@@ -108,7 +108,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
     next_ (next),
     prev_ (0)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
   char *n = this->name_;
   ACE_OS::strcpy (n, name);
   if (next != 0)
@@ -117,7 +117,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
 {
-  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
   ACE_ASSERT (0); // not implemented!
 }
 
@@ -143,7 +143,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
 {
-  ACE_TRACE ("ACE_Name_Node");
+  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("pointer = %x"), (const char *) this->pointer_));
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index b94b2037462..56a2609d04d 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -1771,7 +1771,7 @@ ACE_POSIX_Asynch_Accept_Handler::ACE_POSIX_Asynch_Accept_Handler (ACE_Reactor* r
 
 ACE_POSIX_Asynch_Accept_Handler::~ACE_POSIX_Asynch_Accept_Handler (void)
 {
-  ACE_TRACE ("ACE_POSIX_Asynch_Accept_Handler::dtor");
+  ACE_TRACE ("ACE_POSIX_Asynch_Accept_Handler::~ACE_POSIX_Asynch_Accept_Handler");
 }
 
 int
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 5d90e221e86..f05ce1e8e1b 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -581,7 +581,7 @@ ACE_Process_Manager::remove (pid_t pid)
 int
 ACE_Process_Manager::remove_proc (size_t i)
 {
-  ACE_TRACE ("ACE_Process_Manager::remove");
+  ACE_TRACE ("ACE_Process_Manager::remove_proc");
 
   // If there's an exit_notify_ <Event_Handler> for this pid, call its
   // <handle_close> method.
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index c5d7a339d41..812e5fb3553 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -95,7 +95,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
                                          int reuse_addr,
                                          ACE_Protocol_Info *protocolinfo)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -202,7 +202,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
                                      u_long flags,
                                      ACE_QoS_Session *qos_session)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe");
 
   if (this->open (mcast_addr,
                   qos_params,
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 1f1cec7d25e..1753b35fd51 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -283,7 +283,7 @@ ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
 int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
                                      ACE_Reactor_Mask mask   )
 {
-  ACE_TRACE ("ACE_XtReactor::remove_handler_i");
+  ACE_TRACE ("ACE_QtReactor::remove_handler_i");
 
   QSocketNotifier *qsock_notifier = 0;
 
@@ -366,7 +366,7 @@ ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
                                const ACE_Time_Value &delta_time,
                                const ACE_Time_Value &interval)
 {
-  ACE_TRACE ("ACE_XtReactor::schedule_timer");
+  ACE_TRACE ("ACE_QtReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, 
                             ace_mon, 
                             this->token_, 
@@ -389,7 +389,7 @@ int
 ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
                              int dont_call_handle_close)
 {
-  ACE_TRACE ("ACE_XtReactor::cancel_timer");
+  ACE_TRACE ("ACE_QtReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (handler, 
                                         dont_call_handle_close ) == -1 ) 
@@ -405,7 +405,7 @@ int ACE_QtReactor::cancel_timer (long  timer_id,
                                  const void **arg,
                                  int dont_call_handle_close )
 {
-  ACE_TRACE( "ACE_XtReactor::cancel_timer" ) ;
+  ACE_TRACE( "ACE_QtReactor::cancel_timer" ) ;
 
   if (ACE_Select_Reactor::cancel_timer (timer_id, 
                                         arg, 
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index fd8a4854c6b..4c463f14f94 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -191,8 +191,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
                                                            const INT_ID &int_id,
                                                            ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>"
-             "::bind (const EXT_ID &ext_id, const INT_ID &int_id, "
+  ACE_TRACE ("ACE_RB_Tree::bind (const EXT_ID &ext_id, const INT_ID &int_id, "
              "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -211,8 +210,7 @@ ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id,
                                                               INT_ID &int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "trybind (const EXT_ID &ext_id, INT_ID &int_id)");
+  ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
@@ -237,8 +235,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_
                                                               INT_ID &int_id,
                                                               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "trybind (const EXT_ID &ext_id, INT_ID &int_id, "
+  ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id, "
              "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -264,8 +261,7 @@ ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
                                                              const INT_ID &int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id)");
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
@@ -291,8 +287,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              const INT_ID &int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
              "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -320,8 +315,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              const INT_ID &int_id,
                                                              INT_ID &old_int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, INT_ID &old_int_id)");
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, "
+             "const INT_ID &int_id, INT_ID &old_int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
@@ -349,8 +344,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              INT_ID &old_int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
              "INT_ID &old_int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -383,8 +377,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              EXT_ID &old_ext_id,
                                                              INT_ID &old_int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
              "EXT_ID &old_ext_id, INT_ID &old_int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -415,8 +408,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              INT_ID &old_int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
+  ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
              "EXT_ID &old_ext_id, INT_ID &old_int_id, "
              "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
@@ -443,8 +435,7 @@ ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id,
                                                            INT_ID &int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "find (const EXT_ID &ext_id, INT_ID &int_id)");
+  ACE_TRACE ("ACE_RB_Tree::find (const EXT_ID &ext_id, INT_ID &int_id)");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry = 0;
@@ -466,8 +457,7 @@ ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id,
                                                            ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "find (const EXT_ID &ext_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
+  ACE_TRACE ("ACE_RB_Tree::find (const EXT_ID &ext_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->find_i (ext_id, entry);
@@ -518,8 +508,7 @@ ACE_INLINE int
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_id,
                                                              INT_ID &int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "unbind (const EXT_ID &ext_id, INT_ID &int_id)");
+  ACE_TRACE ("ACE_RB_Tree::unbind (const EXT_ID &ext_id, INT_ID &int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   int result = this->remove_i (ext_id, int_id);
diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp
index 096c46e7ae1..670965810b6 100644
--- a/ace/RW_Process_Mutex.cpp
+++ b/ace/RW_Process_Mutex.cpp
@@ -25,7 +25,7 @@ ACE_RW_Process_Mutex::ACE_RW_Process_Mutex (const ACE_TCHAR *name,
 
 ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void)
 {
-// ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex");
+// ACE_TRACE ("ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex");
 }
 
 void
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 2ca9ee60593..bf81a924f52 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -242,7 +242,7 @@ ACE_Reactor::reactor_event_loop_done (void)
 void
 ACE_Reactor::reset_reactor_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::reset_event_loop");
+  ACE_TRACE ("ACE_Reactor::reset_reactor_event_loop");
 
   this->implementation_->deactivate (0);
 }
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index a7e7e754b98..d376729ff23 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -216,7 +216,7 @@ int
 ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_names");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
@@ -255,7 +255,7 @@ int
 ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
                                            const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_values");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
@@ -294,7 +294,7 @@ int
 ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_types");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index f8899f63c35..86aec7547d8 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -384,7 +384,7 @@ ACE_Remote_Token_Proxy::owner_id (void)
 void
 ACE_Remote_Token_Proxy::dump (void) const
 {
-  ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
+  ACE_TRACE ("ACE_Remote_Token_Proxy::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Tokens::dump:\n")
               ACE_LIB_TEXT (" ignore_shadow_deadlock_ = %d\n"),
diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i
index 723a3d3b9d8..8a7c094f8a5 100644
--- a/ace/SOCK_Dgram.i
+++ b/ace/SOCK_Dgram.i
@@ -90,7 +90,7 @@ ACE_SOCK_Dgram::recv (iovec buffers[],
                       ACE_OVERLAPPED *overlapped,
                       ACE_OVERLAPPED_COMPLETION_FUNC func) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::recv");
+  ACE_TRACE ("ACE_SOCK_Dgram::recv");
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int addr_len = addr.get_size ();
 
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 62e2a46cc41..e55458d26d1 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -683,7 +683,7 @@ ACE_WString::char_rep (void) const
 ACE_USHORT16 *
 ACE_WString::ushort_rep (void) const
 {
-  ACE_TRACE ("ACE_WString::char_rep");
+  ACE_TRACE ("ACE_WString::ushort_rep");
   if (this->len_ <= 0)
     return 0;
   else
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index 319681a22f5..8fc63accb47 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -282,7 +282,7 @@ ACE_SUN_Proactor::start_aio (ACE_POSIX_Asynch_Result *result)
 int
 ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result)
 {
-  ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::cancel_aiocb");
+  ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb");
   int rc = ::aiocancel (& result->aio_resultp);
   
   if (rc == 0)    //  AIO_CANCELED
@@ -294,7 +294,7 @@ ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result)
 int
 ACE_SUN_Proactor::cancel_aio (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::cancel_aio");
+  ACE_TRACE ("ACE_SUN_Proactor::cancel_aio");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->mutex_, -1));
         
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index e3ac7b8f0e9..c398a82c620 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -739,7 +739,7 @@ int
 ACE_Select_Reactor_Notify::dispatch_notifications (int &number_of_active_handles,
                                                    ACE_Handle_Set &rd_mask)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Notify::handle_notification");
+  ACE_TRACE ("ACE_Select_Reactor_Notify::dispatch_notifications");
 
   ACE_HANDLE read_handle =
     this->notification_pipe_.read_handle ();
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 8f12abd2edd..fb6149ebda5 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -187,7 +187,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew (void)
 template <class ACE_SELECT_REACTOR_MUTEX> void
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::dump (void) const
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token::dump");
+  ACE_TRACE ("ACE_Select_Reactor_Token_T::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
@@ -199,20 +199,20 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T
   (ACE_Select_Reactor_Impl &r)
     : select_reactor_ (&r)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token::ACE_Select_Reactor_Token");
+  ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX>
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T (void)
   : select_reactor_ (0)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token::ACE_Select_Reactor_Token");
+  ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX>
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::~ACE_Select_Reactor_Token_T (void)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token::~ACE_Select_Reactor_Token");
+  ACE_TRACE ("ACE_Select_Reactor_Token_T::~ACE_Select_Reactor_Token_T");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX> ACE_Select_Reactor_Impl &
@@ -233,7 +233,7 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::select_reactor
 template <class ACE_SELECT_REACTOR_MUTEX> void
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::sleep_hook (void)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token::sleep_hook");
+  ACE_TRACE ("ACE_Select_Reactor_Token_T::sleep_hook");
   if (this->select_reactor_->notify () == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
@@ -869,7 +869,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i
 template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_i (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_Select_Reactor_T::resume");
+  ACE_TRACE ("ACE_Select_Reactor_T::resume_i");
   if (this->handler_rep_.find (handle) == 0)
     return -1;
 
diff --git a/ace/Service_Object.i b/ace/Service_Object.i
index 85e4d64278f..7b735cf6c1f 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.i
@@ -82,6 +82,6 @@ ACE_Service_Type::active (int turnon)
 ACE_INLINE int
 ACE_Service_Type::fini_called (void) const
 {
-  ACE_TRACE ("ACE_Service_TYpe::fini_called");
+  ACE_TRACE ("ACE_Service_Type::fini_called");
   return this->fini_already_called_;
 }
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index a73c576236d..3525df3b7af 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -37,7 +37,7 @@ ACE_Service_Repository::ACE_Service_Repository (void)
 ACE_Service_Repository *
 ACE_Service_Repository::instance (int size /* = ACE_Service_Repository::DEFAULT_SIZE */)
 {
-  ACE_TRACE ("ACE_Service_Config::instance");
+  ACE_TRACE ("ACE_Service_Repository::instance");
 
   if (ACE_Service_Repository::svc_rep_ == 0)
     {
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 623384a46a3..ed2c81f53f8 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -18,7 +18,7 @@ ACE_RCSID(ace, Signal, "$Id$")
 extern "C" void
 ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 {
-  ACE_TRACE ("ace_signal_handler_dispatch");
+  ACE_TRACE ("ace_sig_handler_dispatch");
   ACE_Sig_Handler::dispatch (signum, info, context);
 }
 
@@ -28,7 +28,7 @@ ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 extern "C" void
 ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 {
-  ACE_TRACE ("ace_signal_handlers_dispatch");
+  ACE_TRACE ("ace_sig_handlers_dispatch");
   ACE_Sig_Handlers::dispatch (signum, info, context);
 }
 
diff --git a/ace/Signal.i b/ace/Signal.i
index 35c6016c8d4..e2ca95be130 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -165,7 +165,7 @@ ACE_Sig_Action::sigaction (void)
 ACE_INLINE void
 ACE_Sig_Action::sigaction (ACE_SignalHandler handler)
 {
-  ACE_TRACE ("ACE_Sig_Action::handler");
+  ACE_TRACE ("ACE_Sig_Action::sigaction");
   this->sa_.sa_sigaction = (void (*)()) ACE_SignalHandlerV (handler);
 }
 #endif /* 0 */
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index 89f8e6a8d29..2d5a78e0423 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -32,7 +32,7 @@ template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *,
                                                           void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::delete (NOOP, 2 parameters)");
+  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (NOOP, 2 parameters)");
   return;
 }
 #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
@@ -81,7 +81,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::delete");
+  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete");
   // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know
   // the pointer was created using new char[] (see operator new code),
   // so we use a cast:
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index a8cc5775964..0f6ff94e0f7 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -626,7 +626,7 @@ int
 ACE_Condition_Thread_Mutex::wait (ACE_Thread_Mutex &mutex,
                                   const ACE_Time_Value *abstime)
 {
-// ACE_TRACE ("ACE_Condition<MUTEX>::wait");
+// ACE_TRACE ("ACE_Condition_Thread_Mutex::wait");
   return ACE_OS::cond_timedwait (&this->cond_,
                                  &mutex.lock_,
                                  (ACE_Time_Value *) abstime);
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 6cd43897ca1..fed6d3dfd0a 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -43,7 +43,7 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 template <class ACE_LOCK, class TYPE> ACE_LOCK &
 ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex (void)
 {
-// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::lock");
+// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex");
   return this->mutex_;
 }
 
@@ -676,7 +676,7 @@ ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void)
 template <class ACE_LOCK> void
 ACE_TSS_Guard<ACE_LOCK>::cleanup (void *ptr)
 {
-// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump");
+// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::cleanup");
 
   // Destructor releases lock.
   delete (ACE_Guard<ACE_LOCK> *) ptr;
diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp
index 76bf66710ee..91357bfc58f 100644
--- a/ace/Thread_Adapter.cpp
+++ b/ace/Thread_Adapter.cpp
@@ -34,7 +34,7 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
         )
   , thr_mgr_ (tm)
 {
-  ACE_OS_TRACE ("Ace_Thread_Adapter::Ace_Thread_Adapter");
+  ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter");
 }
 
 ACE_Thread_Adapter::~ACE_Thread_Adapter (void)
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 4fa0fdab0d0..a9578efc99b 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -113,7 +113,7 @@ void
 ACE_Thread_Descriptor::do_at_exit ()
 
 {
-  ACE_TRACE ("ACE_Thread_Descriptor::at_exit");
+  ACE_TRACE ("ACE_Thread_Descriptor::do_at_exit");
   while (at_exit_list_!=0)
     this->at_pop ();
 }
@@ -2146,7 +2146,7 @@ ACE_Thread_Manager::hthread_grp_list (int grp_id,
                                       ACE_hthread_t hthread_list[],
                                       size_t n)
 {
-  ACE_TRACE ("ACE_Thread_Manager::hthread_list");
+  ACE_TRACE ("ACE_Thread_Manager::hthread_grp_list");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
 
   size_t hthread_count = 0;
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index fac86848441..589138fdc04 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -22,7 +22,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &heap)
   : timer_heap_ (heap)
 {
-  ACE_TRACE ("ACE_Timer_Heap_Iterator::ACE_Timer_Heap_Iterator");
+  ACE_TRACE ("ACE_Timer_Heap_Iterator_T::ACE_Timer_Heap_Iterator");
   this->first();
 }
 
@@ -161,7 +161,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap::~ACE_Timer_Heap");
+  ACE_TRACE ("ACE_Timer_Heap_T::~ACE_Timer_Heap_T");
 
   delete iterator_;
 
@@ -193,7 +193,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap::pop_freelist");
+  ACE_TRACE ("ACE_Timer_Heap_T::pop_freelist");
 
   // We need to truncate this to <int> for backwards compatibility.
   int new_id = ACE_static_cast (int,
@@ -210,7 +210,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id)
 {
-  ACE_TRACE ("ACE_Timer_Heap::push_freelist");
+  ACE_TRACE ("ACE_Timer_Heap_T::push_freelist");
 
   // The freelist values in the <timer_ids_> are negative, so we need
   // to negate them to get the next freelist "pointer."
@@ -221,7 +221,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::timer_id (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap::timer_id");
+  ACE_TRACE ("ACE_Timer_Heap_T::timer_id");
 
   // Return the next item off the freelist and use it as the timer id.
   return this->pop_freelist ();
@@ -232,7 +232,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::timer_id (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap::is_empty");
+  ACE_TRACE ("ACE_Timer_Heap_T::is_empty");
   return this->cur_size_ == 0;
 }
 
@@ -248,14 +248,14 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value &
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap::earliest_time");
+  ACE_TRACE ("ACE_Timer_Heap_T::earliest_time");
   return this->heap_[0]->get_timer_value ();
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap::dump");
+  ACE_TRACE ("ACE_Timer_Heap_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_size_ = %d"), this->max_size_));
@@ -501,7 +501,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *expired)
 {
-  ACE_TRACE ("ACE_Timer_Heap::reschedule");
+  ACE_TRACE ("ACE_Timer_Heap_T::reschedule");
 
   // If we are rescheduling then we have freed our timer id so we need
   // to reacquire it.  NOTE: we rely on the fact that we will get the
@@ -565,7 +565,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
                                                      const ACE_Time_Value &future_time,
                                                      const ACE_Time_Value &interval)
 {
-  ACE_TRACE ("ACE_Timer_Heap::schedule");
+  ACE_TRACE ("ACE_Timer_Heap_T::schedule");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
@@ -602,7 +602,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
                                                    const void **act,
                                                    int dont_call)
 {
-  ACE_TRACE ("ACE_Timer_Heap::cancel");
+  ACE_TRACE ("ACE_Timer_Heap_T::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Locate the ACE_Timer_Node that corresponds to the timer_id.
@@ -682,7 +682,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
                                                    int dont_call)
 {
-  ACE_TRACE ("ACE_Timer_Heap::cancel");
+  ACE_TRACE ("ACE_Timer_Heap_T::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_cancellations = 0;
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index adc3ff9922a..68fe024b63b 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -294,7 +294,7 @@ ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
 void
 ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_TkReactor::remove_TkInput");
+  ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler");
 
   ACE_TkReactorID *TkID = this->ids_;
 
diff --git a/ace/Token.cpp b/ace/Token.cpp
index 748016d8dea..28b3f52adc5 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -88,7 +88,7 @@ ACE_Token::ACE_Token_Queue::ACE_Token_Queue (void)
 void
 ACE_Token::ACE_Token_Queue::remove_entry (ACE_Token::ACE_Token_Queue_Entry *entry)
 {
-  ACE_TRACE ("ACE_Token::remove_entry");
+  ACE_TRACE ("ACE_Token::ACE_Token_Queue::remove_entry");
   ACE_Token_Queue_Entry *curr = 0;
   ACE_Token_Queue_Entry *prev = 0;
 
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index 055e69a2f14..13e21c361fc 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -39,7 +39,7 @@ ACE_Token_Manager::~ACE_Token_Manager ()
 ACE_Token_Manager *
 ACE_Token_Manager::instance (void)
 {
-  ACE_TRACE ("ACE_Token_Manager::token_manager");
+  ACE_TRACE ("ACE_Token_Manager::instance");
 
   // This first check is to avoid acquiring the mutex in the common
   // case.  Double-Check pattern rules.
@@ -69,7 +69,7 @@ void
 ACE_Token_Manager::get_token (ACE_Token_Proxy *proxy,
                               const ACE_TCHAR *token_name)
 {
-  ACE_TRACE ("ACE_Token_Manager::get");
+  ACE_TRACE ("ACE_Token_Manager::get_token");
   // Hmm.  I think this makes sense.  We perform our own locking here
   // (see safe_acquire.)  We have to make sure that only one thread
   // uses the collection at a time.
@@ -212,7 +212,7 @@ ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id)
 void
 ACE_Token_Manager::release_token (ACE_Tokens *&token)
 {
-  ACE_TRACE ("ACE_Token_Manager::release");
+  ACE_TRACE ("ACE_Token_Manager::release_token");
   // again, let's perform our own locking here.
 
   ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_);
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index b0e63f5dfa6..9cfeddf036c 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -588,7 +588,11 @@ sub check_for_bad_ace_trace()
                     $class = $1;
                     $function = $2;
                 }
-                elsif (m/^([^\s^\(]*) \(/i) {
+                elsif (m/^([^\s^\(^\#]*) \(/i) {
+                    $class = "";
+                    $function = $1;
+                }
+                elsif (m/^(operator.*) \(/i) {
                     $class = "";
                     $function = $1;
                 }
diff --git a/docs/ACE-categories.html b/docs/ACE-categories.html
index cbde3ec44f4..5500b5d5247 100644
--- a/docs/ACE-categories.html
+++ b/docs/ACE-categories.html
@@ -15,10 +15,10 @@ bgcolor="#ffffff">
 <h3><a href = "http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</a> Class Categories</h3>
 
 This document groups each file in <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace">$ACE_ROOT/ace</A>
+HREF="../ace">$ACE_ROOT/ace</A>
 into its appropriate class category and provides a link to the C++
 source code and <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/man/acewindex.html">HTML
+HREF="http://doc.ece.uci.edu/Doxygen/Current/html/ace/">HTML
 versions</A> of the relevant manual pages</A>. <P>
 
 <b>[ACE]</b>
diff --git a/docs/ACE-porting.html b/docs/ACE-porting.html
index 196c28981c6..e64bc25fc57 100644
--- a/docs/ACE-porting.html
+++ b/docs/ACE-porting.html
@@ -30,11 +30,11 @@ straightforward to port TAO, as well.<P>
 <H4>Create a <CODE>config.h</CODE> Header File for the Target OS Platform</H4>
 
 A <CODE>config-*.h</CODE> header file exists in <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/">$ACE_ROOT/ace</A>
+HREF="../ace/">$ACE_ROOT/ace</A>
 for each platform to which ACE has been ported.  This file contains
 the portability macros for each particular configuration of ACE.  A
 complete description of the existent macros can be found in the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/README">$ACE_ROOT/ace/README</A>
+HREF="../ace/README">$ACE_ROOT/ace/README</A>
 file. <P>
 
 Currently, you must edit this file by hand to port it to new OS
@@ -57,7 +57,7 @@ how ACE has been ported to other operating systems in the
 
 Optional features in pthreads are covered by <CODE>ACE_HAS_*</CODE>
 and/or <CODE>ACE_LACKS_*</CODE> macros, which are described in the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/README">$ACE_ROOT/ace/README</A>
+HREF="../ace/README">$ACE_ROOT/ace/README</A>
 file.  Particular platform features, such as DCE pthreads calls that
 end in <CODE>_np</CODE>, should be bracketed by platform defines
 rather than by inventing more <CODE>ACE_HAS_*</CODE> or
@@ -90,12 +90,10 @@ After porting the <CODE>ACE_OS</CODE> class, the next step is to port
 all of the ACE C++ wrapper components, such as sockets, threads,
 synchronization mechanisms.  A full list of the categories and classes
 can be found in the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-categories">$ACE_ROOT/ACE-categories</a>
+HREF="ACE-categories.html">$ACE_ROOT/ACE-categories</a>
 file.  It is easiest to concentrate on porting one category at the
-time.  The ACE release contain a <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/tests/README">one-button
-test suite</A> in the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/tests/">$ACE_ROOT/tests/</A>
+time.  The ACE release contain a <A HREF="../tests/README">one-button
+test suite</A> in the <A HREF="../tests/">$ACE_ROOT/tests/</A>
 directory.  These tests can be used to validate the correctness of the
 various ACE C++ wrappers as they are ported. <P>
 
@@ -114,7 +112,7 @@ platform-dependent code is localized in the lower layers of ACE. <P>
 
 After porting and successfully testing all the ACE framework
 components, it also should be relatively easy to port and <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install</A>
+HREF="../TAO/TAO-INSTALL.html">install</A>
 TAO because all of its platform-dependent code is localized in ACE.
 Typically, the only problems that arise when porting TAO is bugs with
 C++ compilers. <P>
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 611c73d0105..4283d7e5b85 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -441,7 +441,7 @@ XtReactor
 
 Here is an example size breakdown, by ACE library component.  It is
 for the ACE 5.0 libACE.a, statically built with these <a
-href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html#flags">make
+href="../ACE-INSTALL.html#flags">make
 flags</a>:
 <pre><code>
     debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0
diff --git a/docs/tutorials/new-tutorials.html b/docs/tutorials/new-tutorials.html
index f9cf9bbc6b6..60748d02f4b 100644
--- a/docs/tutorials/new-tutorials.html
+++ b/docs/tutorials/new-tutorials.html
@@ -71,7 +71,6 @@ Organization can come later...  <P>
 <HR><P>
 Back to the <A
 HREF="../ACE-tutorials.html">ACE
-tutorials</A> or <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/TAO-tutorials.html">TAO
+tutorials</A> or <A HREF="../../TAO/docs/TAO-tutorials.html">TAO
 tutorials</A> page.
 
diff --git a/netsvcs/ACE-netsvcs.html b/netsvcs/ACE-netsvcs.html
index a6f423c51b7..262652c6a7d 100644
--- a/netsvcs/ACE-netsvcs.html
+++ b/netsvcs/ACE-netsvcs.html
@@ -12,8 +12,7 @@ bgcolor="#ffffff">
 <HR>
 <H3>Overview of the ACE Network Services</H3>
 
-ACE provides a <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/netsvcs/">
+ACE provides a <A HREF=".">
 standard library</A> of network services:<P>
 
 <TABLE>
@@ -53,8 +52,7 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config">Service
 Configurator</A>, which is an object-oriented framework that automates
 the configuration and reconfiguration of multi-service daemons.  All
 the ACE network services are configured using the Service
-Configurator.  Please refer to the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">online
+Configurator.  Please refer to the <A HREF="../ACE-INSTALL.html">online
 documentation</a> for more information on installing and testing the
 ACE network services.<P>
 
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index 35cb49706b1..9a68d50ef8f 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -197,7 +197,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void)
 template<class SLH, class LMR, class SST> int
 ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor<SLH, LMR, SST>::init");
+  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -239,7 +239,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
 template<class SLH, class LMR, class SST> int
 ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor<SLH, LMR, SST>::parse_args");
+  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args");
 
   this->service_port_ = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index d15eda54610..c58fabbaed8 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -331,7 +331,7 @@ ACE_Token_Handler::get_proxy (void)
 ACE_Token_Proxy *
 ACE_Token_Handler::create_proxy (void)
 {
-  ACE_TRACE ("ACE_Token_Handler::new_proxy");
+  ACE_TRACE ("ACE_Token_Handler::create_proxy");
 
   ACE_Token_Proxy *proxy;
author	brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-03-04 00:55:32 +0000
committer	brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-03-04 00:55:32 +0000
commit	5d39a8906b66bef09613fb9651cc070bb01b29a6 (patch)
tree	21940e84f154c881896f933dd3bc974ed67cf2f0
parent	3b3c3d425a7fad3f2dff986629d8317961d3b08a (diff)
download	ATCD-5d39a8906b66bef09613fb9651cc070bb01b29a6.tar.gz