ChangeLogTag:Sun Jul 27 20:19:48 UTC 2003 Don Hinton <dhinton@dresystems.com>

author: dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-07-27 20:48:28 +0000
committer: dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-07-27 20:48:28 +0000
commit: 41ca832cf1f94eff93d38e0a67124b7a2d915a84 (patch)
tree: 41ca1b5df67921f46f3cb4b73434c76c82006d06 /ace
parent: 4879ded451b9dcd1a5e85d9e0e4bbd4fd634fecc (diff)
download: ATCD-41ca832cf1f94eff93d38e0a67124b7a2d915a84.tar.gz
186 files changed, 750 insertions, 49 deletions
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index ccf88313461..4304b8b3eae 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -17,6 +17,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_ARGV)
 void
 ACE_ARGV::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ARGV::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -33,6 +34,7 @@ ACE_ARGV::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Creates this->argv_ out of this->buf_.  New memory is allocated for
diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp
index e2eb96146e6..08a5af64d68 100644
--- a/ace/ATM_Acceptor.cpp
+++ b/ace/ATM_Acceptor.cpp
@@ -19,12 +19,6 @@ ACE_RCSID(ace, ATM_Acceptor, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Acceptor)
 
-void
-ACE_ATM_Acceptor::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_Acceptor::dump");
-}
-
 ACE_ATM_Acceptor::ACE_ATM_Acceptor (void)
 {
   ACE_TRACE ("ACE_ATM_Acceptor::ACE_ATM_Acceptor");
diff --git a/ace/ATM_Acceptor.i b/ace/ATM_Acceptor.i
index 3561cfa4733..ba0630dd6d6 100644
--- a/ace/ATM_Acceptor.i
+++ b/ace/ATM_Acceptor.i
@@ -1,7 +1,16 @@
+/* -*- C++ -*- */
 // $Id$
 
 // ATM_Acceptor.i
 
+ACE_INLINE void
+ACE_ATM_Acceptor::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_ATM_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
 ACE_INLINE
 ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap,
                                     int backlog,
@@ -26,5 +35,3 @@ ACE_ATM_Acceptor::close (void)
   return 0;
 #endif // ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM
 }
-
-
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index 1cb266876e6..8882854f85a 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -488,6 +488,7 @@ ACE_ATM_Addr::operator == (const ACE_ATM_Addr &sap) const
 void
 ACE_ATM_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_ATM_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -498,6 +499,7 @@ ACE_ATM_Addr::dump (void) const
                    this->addr_to_string ());
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.i
index 41bb6c27193..30c0d85cb3f 100644
--- a/ace/ATM_Addr.i
+++ b/ace/ATM_Addr.i
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 // $Id$
 
 // ATM_Addr.i
diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp
index c04294ab0c1..f4704038b6a 100644
--- a/ace/ATM_Connector.cpp
+++ b/ace/ATM_Connector.cpp
@@ -14,12 +14,6 @@ ACE_RCSID(ace, ATM_Connector, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector)
 
-void
-ACE_ATM_Connector::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_Connector::dump");
-}
-
 ACE_ATM_Connector::ACE_ATM_Connector (void)
 {
   ACE_TRACE ("ACE_ATM_Connector::ACE_ATM_Connector");
diff --git a/ace/ATM_Connector.i b/ace/ATM_Connector.i
index 6b6d6fb876c..50bde9ce55f 100644
--- a/ace/ATM_Connector.i
+++ b/ace/ATM_Connector.i
@@ -3,6 +3,14 @@
 
 // ATM_Connector.i
 
+ACE_INLINE void
+ACE_ATM_Connector::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_ATM_Connector::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
 ACE_INLINE
 ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, 
                                       const ACE_ATM_Addr &remote_sap, 
diff --git a/ace/ATM_Params.cpp b/ace/ATM_Params.cpp
index dba4af08daf..a8a84f66ec7 100644
--- a/ace/ATM_Params.cpp
+++ b/ace/ATM_Params.cpp
@@ -12,11 +12,5 @@ ACE_RCSID(ace, ATM_Params, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Params)
 
-void
-ACE_ATM_Params::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_Params::dump");
-}
-
 #endif /* ACE_HAS_ATM */
 
diff --git a/ace/ATM_Params.i b/ace/ATM_Params.i
index 43bce9f0a42..4006d4d00b5 100644
--- a/ace/ATM_Params.i
+++ b/ace/ATM_Params.i
@@ -1,7 +1,16 @@
+/* -*- C++ -*- */
 // $Id$
 
 // ATM_Params.i
 
+ACE_INLINE void
+ACE_ATM_Params::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_ATM_Params::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
 ACE_INLINE
 ACE_ATM_Params::ACE_ATM_Params (int rw_flag,
                                 const char device[],
diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp
index ffdfe21413f..cf69d373d2d 100644
--- a/ace/ATM_QoS.cpp
+++ b/ace/ATM_QoS.cpp
@@ -416,12 +416,6 @@ ACE_ATM_QoS::set_cbr_rate (int rate,
 }
 
 void
-ACE_ATM_QoS::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_QoS::dump");
-}
-
-void
 ACE_ATM_QoS::set_rate (ACE_HANDLE fd,
                        int rate,
                        int flags)
diff --git a/ace/ATM_QoS.i b/ace/ATM_QoS.i
index 349fb962027..ac5b7de890f 100644
--- a/ace/ATM_QoS.i
+++ b/ace/ATM_QoS.i
@@ -1,7 +1,16 @@
+/* -*- C++ -*- */
 // $Id$
 
 // ATM_QoS.i
 
+ACE_INLINE void
+ACE_ATM_QoS::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_ATM_QoS::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
 ACE_INLINE
 ACE_ATM_QoS::~ACE_ATM_QoS ()
 {
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp
index 0bd8c537eac..fbcd1db85f5 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -12,12 +12,6 @@ ACE_RCSID (ace, ATM_Stream, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE (ACE_ATM_Stream)
 
-void
-ACE_ATM_Stream::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_Stream::dump");
-}
-
 char*
 ACE_ATM_Stream::get_peer_name (void) const
 {
diff --git a/ace/ATM_Stream.i b/ace/ATM_Stream.i
index 904934e75a5..9c11fd93b7c 100644
--- a/ace/ATM_Stream.i
+++ b/ace/ATM_Stream.i
@@ -1,8 +1,15 @@
+/* -*- C++ -*- */
 // $Id$
 
 // ATM_Stream.i
 
-#include "ace/ATM_Stream.h"
+ACE_INLINE void
+ACE_ATM_Stream::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_ATM_Stream::dump");
+#endif /* ACE_HAS_DUMP */
+}
 
 ACE_INLINE
 ACE_ATM_Stream::ACE_ATM_Stream (void)
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index be79daa6857..ceb657608f2 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -22,11 +22,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor)
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
 ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->peer_acceptor_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
@@ -450,6 +452,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void)
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
 ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -468,6 +471,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
               this->service_description_ == 0 ? ACE_LIB_TEXT ("<unknown>") : this->service_description_));
   this->service_addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR &
@@ -833,6 +837,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Oneshot_Acceptor)
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
 ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -843,6 +848,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
               delete_concurrency_strategy_));
   this->concurrency_strategy_->dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
diff --git a/ace/Activation_Queue.cpp b/ace/Activation_Queue.cpp
index 9a271c4d7ae..476bc900e25 100644
--- a/ace/Activation_Queue.cpp
+++ b/ace/Activation_Queue.cpp
@@ -11,10 +11,10 @@ ACE_RCSID (ace,
            Activation_Queue,
            "$Id$")
 
-
 void
 ACE_Activation_Queue::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("delete_queue_ = %d\n"),
@@ -25,6 +25,7 @@ ACE_Activation_Queue::dump (void) const
   else
     ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(NULL)\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Activation_Queue::ACE_Activation_Queue (ACE_Message_Queue<ACE_SYNCH> *new_queue,
diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.i
index 981594c3dfc..fd9ff0df6c6 100644
--- a/ace/Active_Map_Manager_T.i
+++ b/ace/Active_Map_Manager_T.i
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 // $Id$
 
 template <class T> ACE_INLINE int
@@ -275,7 +276,9 @@ ACE_Active_Map_Manager<T>::npos (void)
 template <class T> ACE_INLINE void
 ACE_Active_Map_Manager<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_AMM_BASE::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
diff --git a/ace/Addr.cpp b/ace/Addr.cpp
index c1621d27b47..b87f440caed 100644
--- a/ace/Addr.cpp
+++ b/ace/Addr.cpp
@@ -20,12 +20,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Addr)
 void
 ACE_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("addr_type_ = %d"), this->addr_type_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\naddr_size_ = %d"), this->addr_size_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Initializes instance variables.
diff --git a/ace/Array_Base.inl b/ace/Array_Base.inl
index b682fec615f..f5698deb9eb 100644
--- a/ace/Array_Base.inl
+++ b/ace/Array_Base.inl
@@ -47,7 +47,9 @@ ACE_Array_Base<T>::operator[] (size_t index) const
 template <class T> ACE_INLINE void
 ACE_Array_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Array_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> ACE_INLINE
diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp
index 371bb372ce4..caec772adf8 100644
--- a/ace/Atomic_Op.cpp
+++ b/ace/Atomic_Op.cpp
@@ -38,8 +38,10 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions (void)
 void
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (_MSC_VER)
diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp
index e9c7f5a9cb4..41436069852 100644
--- a/ace/Atomic_Op_T.cpp
+++ b/ace/Atomic_Op_T.cpp
@@ -29,10 +29,12 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex (void)
 template <class ACE_LOCK, class TYPE> void
 ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->mutex_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class ACE_LOCK, class TYPE>
diff --git a/ace/Atomic_Op_T.i b/ace/Atomic_Op_T.i
index 45d06384256..2ba365a1aa6 100644
--- a/ace/Atomic_Op_T.i
+++ b/ace/Atomic_Op_T.i
@@ -245,7 +245,9 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const
 template <class ACE_LOCK, class TYPE> ACE_INLINE void
 ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->impl_.dump ();
+#endif /* ACE_HAS_DUMP */
   return;
 }
 
diff --git a/ace/Auto_IncDec_T.cpp b/ace/Auto_IncDec_T.cpp
index 2ca06874a2e..59a833e2303 100644
--- a/ace/Auto_IncDec_T.cpp
+++ b/ace/Auto_IncDec_T.cpp
@@ -21,10 +21,12 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Auto_IncDec)
 template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> void
 ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_AUTO_INCDEC_T_C */
diff --git a/ace/Auto_Ptr.cpp b/ace/Auto_Ptr.cpp
index 888a65d02e7..9055a913d3e 100644
--- a/ace/Auto_Ptr.cpp
+++ b/ace/Auto_Ptr.cpp
@@ -14,20 +14,8 @@ ACE_RCSID(ace, Auto_Ptr, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Ptr)
 
-template<class X> void
-ACE_Auto_Basic_Ptr<X>::dump (void) const
-{
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::dump");
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Auto_Basic_Array_Ptr)
 
-template<class X> void
-ACE_Auto_Basic_Array_Ptr<X>::dump (void) const
-{
-  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::dump");
-}
-
 #if defined (__MINGW32__)
 # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
              (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index 7fba5b4edfa..e9be881dcaa 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -3,6 +3,22 @@
 
 // Auto_Ptr.i
 
+template<class X> ACE_INLINE void
+ACE_Auto_Basic_Ptr<X>::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
+template<class X> ACE_INLINE void
+ACE_Auto_Basic_Array_Ptr<X>::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::dump");
+#endif /* ACE_HAS_DUMP */
+}
+
 template<class X> ACE_INLINE
 ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &rhs)
   : p_ (rhs.release ())
diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp
index 5bf6352b406..de3e9779e08 100644
--- a/ace/Based_Pointer_T.cpp
+++ b/ace/Based_Pointer_T.cpp
@@ -22,13 +22,16 @@ ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void)
 template <class CONCRETE> void
 ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntarget_ = %d\n"), this->target_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_offset_ = %d\n"), this->base_offset_));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), 
+              (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this))));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class CONCRETE>
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index 9460c2df16d..f35de6a168d 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -405,13 +405,14 @@ ACE_Cache_Map_Manager<ACE_T2>::unbind (const KEY &key,
   return unbind_result;
 }
 
-
 template <ACE_T1> void
 ACE_Cache_Map_Manager<ACE_T2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->map_.dump ();
 
   this->caching_strategy_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #undef ACE_T1
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i
index ab90786fe1b..d4a77422224 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.i
@@ -149,11 +149,12 @@ ACE_Cache_Map_Iterator<ACE_T2>::operator-- (int)
   return retn;
 }
 
-
 template <ACE_T1> ACE_INLINE void
 ACE_Cache_Map_Iterator<ACE_T2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->iterator_implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_T1> ACE_INLINE
@@ -252,7 +253,9 @@ ACE_Cache_Map_Reverse_Iterator<ACE_T2>::operator-- (int)
 template <ACE_T1> ACE_INLINE void
 ACE_Cache_Map_Reverse_Iterator<ACE_T2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->reverse_iterator_implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_T1> ACE_INLINE
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i
index b57b9fc4f38..be5e7b86c62 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.i
@@ -101,10 +101,12 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::cachi
 template<class ATTRIBUTES, class CACHING_UTILITY, class IMPLEMENTATION> ACE_INLINE void
 ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -190,11 +192,13 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
 ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("timer_ = %d "), this->timer_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -272,10 +276,12 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
 ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -358,11 +364,13 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
 ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("order_ = %d "), this->order_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -439,10 +447,12 @@ ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::caching_utility (void)
 template<class ATTRIBUTES, class CACHING_UTILITY> ACE_INLINE void
 ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //////////////////////////////////////////////////////////////////////////////////
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index abacf6c061e..60f343f0cad 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -53,12 +53,14 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (long id)
 template <class SVC_HANDLER> void
 ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("svc_handler_ = %x"), this->svc_handler_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\ntimer_id_ = %d"), this->timer_id_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> SVC_HANDLER *
@@ -182,11 +184,13 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void)
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
 ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nflags_ = %d"), this->flags_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index c66adc468d1..a0178e1d7ea 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -23,7 +23,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Stack)
 template <class T> void
 ACE_Bounded_Stack<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Stack<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template<class T>
@@ -85,7 +87,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Stack)
 template <class T, size_t ACE_SIZE> void
 ACE_Fixed_Stack<T, ACE_SIZE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template<class T, size_t ACE_SIZE>
@@ -133,7 +137,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Stack)
 template <class T> void
 ACE_Unbounded_Stack<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template<class T>
@@ -494,7 +500,9 @@ ACE_Double_Linked_List_Iterator<T>::advance_and_remove (int dont_remove)
 template <class T> void
 ACE_Double_Linked_List_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // Prefix advance.
@@ -596,7 +604,9 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::advance_and_remove (int dont_remove)
 template <class T> void
 ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // Prefix advance.
@@ -783,7 +793,9 @@ ACE_Double_Linked_List<T>::size (void) const
 template <class T> void
 ACE_Double_Linked_List<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // Dump the state of an object.
+#endif /* ACE_HAS_DUMP */
 }
 
 #if 0
@@ -913,7 +925,9 @@ ACE_Bounded_Set<T>::size (void) const
 template <class T, size_t ACE_SIZE> void
 ACE_Fixed_Set<T, ACE_SIZE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T, size_t ACE_SIZE>
@@ -1045,7 +1059,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set_Iterator)
   template <class T, size_t ACE_SIZE> void
 ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T, size_t ACE_SIZE>
@@ -1107,7 +1123,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set_Const_Iterator)
   template <class T, size_t ACE_SIZE> void
 ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T, size_t ACE_SIZE>
@@ -1169,7 +1187,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set)
   template <class T> void
 ACE_Bounded_Set<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Set<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -1334,7 +1354,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set_Iterator)
   template <class T> void
 ACE_Bounded_Set_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -1411,7 +1433,9 @@ ACE_DNode<T>::~ACE_DNode (void)
 template <class T> void
 ACE_Unbounded_Stack_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -1595,6 +1619,7 @@ ACE_Ordered_MultiSet<T>::reset (void)
 template <class T> void
 ACE_Ordered_MultiSet<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   //  ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump");
   //
   //  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -1611,6 +1636,7 @@ ACE_Ordered_MultiSet<T>::dump (void) const
   //    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %d\n"), count++));
   //
   //  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> int
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index e05ddbec0cc..8ab364e5f5a 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -243,7 +243,9 @@ ACE_Ordered_MultiSet_Iterator<T>::done (void) const
 template <class T> ACE_INLINE void
 ACE_Ordered_MultiSet_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -332,7 +334,9 @@ ACE_DLList<T>::get (T *&item, size_t index)
 template <class T> ACE_INLINE void
 ACE_DLList<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DLList_Base::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> ACE_INLINE int
@@ -411,7 +415,9 @@ ACE_DLList_Iterator<T>::advance (void)
 template <class T> ACE_INLINE void
 ACE_DLList_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -465,5 +471,7 @@ ACE_DLList_Reverse_Iterator<T>::next (void) const
 template <class T> ACE_INLINE void
 ACE_DLList_Reverse_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
diff --git a/ace/DEV.cpp b/ace/DEV.cpp
index fce2d15362a..79f70a4e52d 100644
--- a/ace/DEV.cpp
+++ b/ace/DEV.cpp
@@ -17,7 +17,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_DEV)
 void
 ACE_DEV::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // This is the do-nothing constructor. 
diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp
index 43dde161857..dda2c97f255 100644
--- a/ace/DEV_Addr.cpp
+++ b/ace/DEV_Addr.cpp
@@ -15,11 +15,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr)
 void
 ACE_DEV_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("devname_ = %s"), this->devname_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Do nothing constructor. 
diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp
index 2334e952719..0800a8677b6 100644
--- a/ace/DEV_Connector.cpp
+++ b/ace/DEV_Connector.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector)
 void
 ACE_DEV_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_DEV_Connector::ACE_DEV_Connector (void)
diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp
index 221dc888e35..4d1d00c2772 100644
--- a/ace/DEV_IO.cpp
+++ b/ace/DEV_IO.cpp
@@ -37,11 +37,13 @@ ACE_DEV_IO::get_remote_addr (ACE_DEV_Addr &addr) const
 void
 ACE_DEV_IO::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DEV_IO::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Simple-minded do nothing constructor. 
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index ac415f7c58d..0af44727309 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -581,6 +581,7 @@ ACE_Dev_Poll_Reactor_Notify::purge_pending_notifications (
 void
 ACE_Dev_Poll_Reactor_Notify::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -589,6 +590,7 @@ ACE_Dev_Poll_Reactor_Notify::dump (void) const
               this->dp_reactor_));
   this->notification_pipe_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // -----------------------------------------------------------------
@@ -2373,6 +2375,7 @@ ACE_Dev_Poll_Reactor::ready_ops (ACE_HANDLE /* handle */,
 void
 ACE_Dev_Poll_Reactor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dev_Poll_Reactor::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -2386,6 +2389,7 @@ ACE_Dev_Poll_Reactor::dump (void) const
               ACE_LIB_TEXT ("deactivated_ = %d"),
               this->deactivated_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 short
diff --git a/ace/Dump_T.cpp b/ace/Dump_T.cpp
index 97386d4ba31..d95e43f15f0 100644
--- a/ace/Dump_T.cpp
+++ b/ace/Dump_T.cpp
@@ -34,8 +34,10 @@ ACE_Dumpable_Adapter<Concrete>::operator->() const
 template <class Concrete> void
 ACE_Dumpable_Adapter<Concrete>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dumpable_Adapter<Concrete>::dump");
   this->this_->dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_DUMP_T_C */
diff --git a/ace/Dynamic_Service_Base.cpp b/ace/Dynamic_Service_Base.cpp
index ab4b1bc5a62..4f62b6de092 100644
--- a/ace/Dynamic_Service_Base.cpp
+++ b/ace/Dynamic_Service_Base.cpp
@@ -13,11 +13,13 @@ ACE_RCSID (ace,
 void
 ACE_Dynamic_Service_Base::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Service_Base::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Get the instance using <name>.
diff --git a/ace/Event_Handler_T.cpp b/ace/Event_Handler_T.cpp
index f0efd27b43f..be894914570 100644
--- a/ace/Event_Handler_T.cpp
+++ b/ace/Event_Handler_T.cpp
@@ -23,7 +23,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Event_Handler_T)
 template <class T> void
 ACE_Event_Handler_T<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Event_Handler_T<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template<class T>
diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp
index 99016a7e93d..50bae5e33a5 100644
--- a/ace/FIFO.cpp
+++ b/ace/FIFO.cpp
@@ -15,11 +15,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FIFO)
 void
 ACE_FIFO::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rendezvous_ = %s"), this->rendezvous_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp
index 7b10a89e017..3b877dfe5db 100644
--- a/ace/FIFO_Recv.cpp
+++ b/ace/FIFO_Recv.cpp
@@ -15,11 +15,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv)
 void
 ACE_FIFO_Recv::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Recv::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_FIFO::dump ();
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int 
diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp
index 714cc43986f..6de0d35cd72 100644
--- a/ace/FIFO_Recv_Msg.cpp
+++ b/ace/FIFO_Recv_Msg.cpp
@@ -15,8 +15,10 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg)
 void
 ACE_FIFO_Recv_Msg::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Recv_Msg::dump");
   ACE_FIFO_Recv::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // Note that persistent means "open FIFO for writing, as well as
diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp
index a51a16f5f96..6f07cc69d88 100644
--- a/ace/FIFO_Send.cpp
+++ b/ace/FIFO_Send.cpp
@@ -15,8 +15,10 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send)
 void
 ACE_FIFO_Send::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Send::dump");
   ACE_FIFO::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_FIFO_Send::ACE_FIFO_Send (void)
diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp
index 08555248f88..bddba5baf38 100644
--- a/ace/FIFO_Send_Msg.cpp
+++ b/ace/FIFO_Send_Msg.cpp
@@ -14,8 +14,10 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg)
 void
 ACE_FIFO_Send_Msg::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FIFO_Send_Msg::dump");
   ACE_FIFO_Send::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ssize_t
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index 509a35f3a6b..70e6f437b1d 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -19,8 +19,10 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FILE)
 void
 ACE_FILE::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE::dump");
   ACE_IO_SAP::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // This is the do-nothing constructor.
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index bac74894feb..d4a2e5236e7 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -106,9 +106,11 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 void
 ACE_FILE_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("filename_ = %s"), this->filename_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index d858fc68c5f..5c65696fa17 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -15,11 +15,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector)
 void
 ACE_FILE_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_Connector::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_FILE_Connector::ACE_FILE_Connector (void)
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 3ae1137bd71..366ffde711a 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -15,11 +15,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO)
 void
 ACE_FILE_IO::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_FILE_IO::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Simple-minded do nothing constructor.
diff --git a/ace/File_Lock.cpp b/ace/File_Lock.cpp
index 7f9c3048aa7..5f227e5c4e8 100644
--- a/ace/File_Lock.cpp
+++ b/ace/File_Lock.cpp
@@ -14,11 +14,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 void
 ACE_File_Lock::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_File_Lock::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h,
diff --git a/ace/Framework_Component.cpp b/ace/Framework_Component.cpp
index 9fd85b1e91d..c668f9c26bd 100644
--- a/ace/Framework_Component.cpp
+++ b/ace/Framework_Component.cpp
@@ -257,7 +257,9 @@ ACE_Framework_Repository::compact (void)
 void
 ACE_Framework_Repository::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Framework_Repository::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Framework_Repository::ACE_Framework_Repository (int size)
diff --git a/ace/Future.cpp b/ace/Future.cpp
index 9db7c5c71f6..c968c21485f 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -44,6 +44,7 @@ ACE_Future_Observer<T>::~ACE_Future_Observer (void)
 template <class T> void
 ACE_Future_Rep<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
               "ref_count_ = %d\n",
@@ -59,6 +60,7 @@ ACE_Future_Rep<T>::dump (void) const
   ACE_DEBUG ((LM_INFO,"value_ready_mutex_: \n"));
   this->value_ready_mutex_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> ACE_Future_Rep<T> *
@@ -402,6 +404,7 @@ ACE_Future<T>::operator = (const ACE_Future<T> &rhs)
 template <class T> void
 ACE_Future<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG,
               ACE_BEGIN_DUMP, this));
 
@@ -410,6 +413,7 @@ ACE_Future<T>::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> ACE_Future_Rep<T> *
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index ceabec5b22f..cfd57c3f88c 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -589,6 +589,7 @@ ACE_Get_Opt::last_option (const ACE_TString &last_option)
 void
 ACE_Get_Opt::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Get_Opt::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -621,6 +622,7 @@ ACE_Get_Opt::dump (void) const
                   this->long_opts_[i]->val_));
     }
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 3a9f92526fd..651cb52b998 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -26,6 +26,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set)
 void
 ACE_Handle_Set::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -45,6 +46,7 @@ ACE_Handle_Set::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Table that maps bytes to counts of the enabled bits in each value
@@ -249,6 +251,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set_Iterator)
 void
 ACE_Handle_Set_Iterator::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Handle_Set_Iterator::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -260,6 +263,7 @@ ACE_Handle_Set_Iterator::dump (void) const
 #endif
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_num_ = %d"), this->word_num_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_HANDLE
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index f8d6ae6aaa3..a666c5c4f16 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -72,21 +72,25 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry (void)
 template <class EXT_ID, class INT_ID> void
 ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("next_ = %d"), this->next_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("prev_ = %d"), this->prev_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
 ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_));
   this->allocator_->dump ();
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int
diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i
index 6c6dc935db8..186fdeae613 100644
--- a/ace/Hash_Map_Manager_T.i
+++ b/ace/Hash_Map_Manager_T.i
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 // $Id$
 
 #include "ace/Synch.h"
@@ -542,9 +543,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Ex)
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
 
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
@@ -612,9 +615,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Const_Iterator_Ex)
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
 
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
@@ -792,9 +797,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Reverse_Iterator_Ex)
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
 ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
 
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 4c2b3449263..4723974bdc9 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -287,6 +287,7 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
 void
 ACE_High_Res_Timer::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_High_Res_Timer::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -318,6 +319,7 @@ ACE_High_Res_Timer::dump (void) const
              ACE_CU64_TO_CU32 (start_incr_ & 0xfffffffful)));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index d29cb18bb75..a2e6d696829 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -57,6 +57,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
 void
 ACE_INET_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_INET_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -65,6 +66,7 @@ ACE_INET_Addr::dump (void) const
   this->addr_to_string(s, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16);
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Compare two addresses for inequality.
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index f3ad46c46b7..272894102a2 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -24,12 +24,14 @@ ACE_IO_SAP::ACE_IO_SAP (void)
 void
 ACE_IO_SAP::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IO_SAP::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Cache for the process ID.
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index 39b73436c96..d50d0580073 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -14,12 +14,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 void
 ACE_IPC_SAP::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_IPC_SAP::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Cache for the process ID.
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index 45f56f5770b..3e9912b104e 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -17,11 +17,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK)
 void
 ACE_LSOCK::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_MSG)
diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp
index b6beee7a1ae..67c86e446c3 100644
--- a/ace/LSOCK_Acceptor.cpp
+++ b/ace/LSOCK_Acceptor.cpp
@@ -27,11 +27,13 @@ ACE_LSOCK_Acceptor::get_local_addr (ACE_Addr &a) const
 void
 ACE_LSOCK_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Acceptor::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->local_addr_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Do nothing routine for constructor.
diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp
index 759bbb42cff..42f2c9eb324 100644
--- a/ace/LSOCK_CODgram.cpp
+++ b/ace/LSOCK_CODgram.cpp
@@ -17,12 +17,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram)
 void
 ACE_LSOCK_CODgram::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_CODgram::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_SOCK_CODgram::dump ();
   ACE_LSOCK::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /* Here's the general-purpose open routine. */
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index b4ef7f4b950..382e5ab3685 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -17,11 +17,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
 void
 ACE_LSOCK_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Connector::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_LSOCK_Connector::ACE_LSOCK_Connector (void)
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp
index 9a44cfa08a0..0ef6755e0a9 100644
--- a/ace/LSOCK_Dgram.cpp
+++ b/ace/LSOCK_Dgram.cpp
@@ -16,12 +16,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram)
 void
 ACE_LSOCK_Dgram::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_LSOCK_Dgram::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_SOCK_Dgram::dump ();
   ACE_LSOCK::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // The "do nothing" constructor. 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 3cbde78bdb8..c1cb753ee9f 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -942,6 +942,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries (
 template <ACE_MEM_POOL_1, class ACE_LOCK> void
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // Note that we *must* use structured exception handling here
   // because (1) we may need to commit virtual memory pages and (2)
   // C++ exception handling doesn't support resumption.
@@ -958,6 +959,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump (void) const
   ACE_SEH_EXCEPT (fake_this->remap (GetExceptionInformation ()))
     {
     }
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_LOCAL_NAME_SPACE_T_CPP */
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 96d844efdc3..8f3dc31e570 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -17,6 +17,7 @@ ACE_RCSID(ace, Local_Tokens, "$Id$")
 void
 ACE_Tokens::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Tokens::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Tokens::dump:\n")
@@ -26,6 +27,7 @@ ACE_Tokens::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("waiters_\n")));
   this->waiters_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Tokens::ACE_Tokens (void)
@@ -55,6 +57,7 @@ ACE_Null_Token::~ACE_Null_Token (void)
 void
 ACE_TPQ_Entry::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TPQ_Entry::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
@@ -72,6 +75,7 @@ ACE_TPQ_Entry::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TPQ_Entry::dump end.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy,
@@ -157,6 +161,7 @@ ACE_TPQ_Entry::client_id (const ACE_TCHAR *id)
 void
 ACE_TSS_TPQ_Entry::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_TPQ_Entry::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
@@ -171,6 +176,7 @@ ACE_TSS_TPQ_Entry::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_TPQ_ENTRY::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TSS_TPQ_Entry::ACE_TSS_TPQ_Entry (const ACE_Token_Proxy *proxy,
@@ -245,6 +251,7 @@ ACE_TPQ_Iterator::advance (void)
 void
 ACE_TPQ_Iterator::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TPQ_Iterator::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_TPQ_Iterator::dump:\n")
@@ -252,11 +259,13 @@ ACE_TPQ_Iterator::dump (void) const
               (long) this->current_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("head_ and tail_\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Token_Proxy_Queue::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Proxy_Queue::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump:\n")
@@ -268,6 +277,7 @@ ACE_Token_Proxy_Queue::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump end.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Token_Proxy_Queue::ACE_Token_Proxy_Queue (void)
@@ -419,6 +429,7 @@ ACE_Token_Proxy_Queue::remove (const ACE_TPQ_Entry *remove_me)
 void
 ACE_Mutex_Token::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mutex_Token::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Mutex_Token::dump:\n")));
@@ -428,6 +439,7 @@ ACE_Mutex_Token::dump (void) const
   ACE_Tokens::dump ();
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Mutex_Token::dump end.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Mutex_Token::ACE_Mutex_Token (const ACE_TCHAR *name)
@@ -656,6 +668,7 @@ ACE_Mutex_Token::is_owner (const ACE_TCHAR *id)
 void
 ACE_RW_Token::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RW_Token::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_RW_Token::dump:\n")
@@ -666,6 +679,7 @@ ACE_RW_Token::dump (void) const
   ACE_Tokens::dump ();
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_RW_Token::dump end.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_RW_Token::ACE_RW_Token (const ACE_TCHAR *name)
@@ -1036,6 +1050,7 @@ ACE_RW_Token::is_owner (const ACE_TCHAR *id)
 void
 ACE_Token_Proxy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Proxy::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Token_Proxy::dump:\n")
@@ -1051,6 +1066,7 @@ ACE_Token_Proxy::dump (void) const
   this->waiter_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy::dump end.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 const ACE_TCHAR *
@@ -1416,6 +1432,7 @@ ACE_Token_Name::~ACE_Token_Name ()
 void
 ACE_Token_Name::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Name::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 #if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS)
@@ -1428,6 +1445,7 @@ ACE_Token_Name::dump (void) const
               token_name_ == 0 ? ACE_LIB_TEXT ("no name") : token_name_));
 #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 0f0c97bf766..830ae9a32dc 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -2130,6 +2130,7 @@ ACE_Log_Msg::conditional_set (const char *filename,
 void
 ACE_Log_Msg::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Log_Msg::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -2170,6 +2171,7 @@ ACE_Log_Msg::dump (void) const
   // Synchronize output operations.
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 168f1d3ef2e..635dfb9224e 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -91,6 +91,7 @@ ACE_Log_Record::priority (u_long p)
 void
 ACE_Log_Record::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Log_Record::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -100,6 +101,7 @@ ACE_Log_Record::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %u\n"), this->pid_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_ = %s\n"), this->msg_data_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index 5a709478364..57d4dc3fa1c 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor)
 void
 ACE_MEM_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Do nothing routine for constructor.
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index a794b734409..67cbc001616 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -138,12 +138,14 @@ ACE_MEM_Addr::get_host_name (void) const
 void
 ACE_MEM_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Addr::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->external_.dump ();
   this->internal_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp
index 4dd5c0c35a1..a249129c16e 100644
--- a/ace/MEM_Connector.cpp
+++ b/ace/MEM_Connector.cpp
@@ -16,11 +16,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector)
 void
 ACE_MEM_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Connector::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_MEM_Connector::ACE_MEM_Connector (void)
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index a745a1b3b9b..6c9d9a84b75 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -311,7 +311,9 @@ ACE_MT_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf,
 void
 ACE_MEM_IO::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_IO::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp
index 1ee429f57c9..9caf5fe0a39 100644
--- a/ace/MEM_SAP.cpp
+++ b/ace/MEM_SAP.cpp
@@ -15,6 +15,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
 void
 ACE_MEM_SAP::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_SAP::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -23,6 +24,7 @@ ACE_MEM_SAP::dump (void) const
   else
     ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_MEM_SAP uninitialized.\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_MEM_SAP::ACE_MEM_SAP (void)
diff --git a/ace/MEM_Stream.cpp b/ace/MEM_Stream.cpp
index 79b37e21838..99a3c29467c 100644
--- a/ace/MEM_Stream.cpp
+++ b/ace/MEM_Stream.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream)
 void
 ACE_MEM_Stream::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MEM_Stream::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index a96c21c8e6e..4326c0b52d9 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -25,17 +25,20 @@ int ACE_Allocator::delete_allocator_ = 0;
 void
 ACE_Control_Block::ACE_Malloc_Header::dump (void) const
 {
+#if defined (ACE_HAS_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 = %@"), (ACE_Malloc_Header *) this->next_block_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Control_Block::print_alignment_info (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::print_alignment_info");
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n")));
   ACE_DEBUG ((LM_DEBUG,
@@ -65,11 +68,13 @@ ACE_Control_Block::print_alignment_info (void)
               sizeof (ACE_Control_Block)
               ));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n")));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Control_Block::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -90,6 +95,7 @@ ACE_Control_Block::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
@@ -145,6 +151,7 @@ ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_Control_Block::ACE_Name_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -156,6 +163,7 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const
               (const char *) this->name_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -171,6 +179,7 @@ ACE_Malloc_Stats::ACE_Malloc_Stats (void)
 void
 ACE_Malloc_Stats::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_Stats::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -183,6 +192,7 @@ ACE_Malloc_Stats::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\nnchunks = %d"), nchunks));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index 73885536cb9..79dfd969d19 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -148,6 +148,7 @@ ACE_New_Allocator::free (void *ptr)
 void
 ACE_Static_Allocator_Base::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Allocator_Base::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -157,6 +158,7 @@ ACE_Static_Allocator_Base::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Malloc_Allocator.i b/ace/Malloc_Allocator.i
index 80ed2f55346..752860b0d1e 100644
--- a/ace/Malloc_Allocator.i
+++ b/ace/Malloc_Allocator.i
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 // $Id$
 
 #include "ace/OS.h"
@@ -87,6 +88,8 @@ ACE_New_Allocator::print_stats (void) const
 ACE_INLINE void
 ACE_New_Allocator::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_INLINE void *
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index 997af40ab62..e163c8b648e 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -136,13 +136,16 @@ ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 template <class MALLOC> void
 ACE_Allocator_Adapter<MALLOC>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::dump");
   this->allocator_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -154,6 +157,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
     this->cb_ptr_->malloc_stats_.dump ();
 #endif /* ACE_HAS_MALLOC_STATS */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_MALLOC_STATS)
@@ -829,6 +833,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::unbind (const char *name)
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
 ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -837,6 +842,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
@@ -922,6 +928,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::advance (void)
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> void
 ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -930,6 +937,7 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 79c7acfc39b..8dea3399ede 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -601,6 +601,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void)
 template <class EXT_ID, class INT_ID> void
 ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("next_ = %d"), this->next_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("prev_ = %d"), this->prev_));
@@ -610,33 +611,40 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const
 #endif /* ACE_HAS_LAZY_MAP_MANAGER */
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_));
   this->allocator_->dump ();
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("next_ = %d"), this->next_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("next_ = %d"), this->next_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK>
@@ -674,19 +682,25 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_MAP_MANAGER_C */
diff --git a/ace/Map_T.i b/ace/Map_T.i
index ff34ee8ae0a..c279bca0446 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.i
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 // $Id$
 
 template <class T> ACE_INLINE int
@@ -501,7 +502,9 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::tot
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE void
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -985,7 +988,9 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) const
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE void
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -1326,7 +1331,9 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE void
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -1667,7 +1674,9 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) const
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE void
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   this->implementation_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
diff --git a/ace/Mem_Map.cpp b/ace/Mem_Map.cpp
index e8885c393aa..c0d066f3980 100644
--- a/ace/Mem_Map.cpp
+++ b/ace/Mem_Map.cpp
@@ -54,6 +54,7 @@ to_mapping_name (ACE_TCHAR *mapobjname,
 void
 ACE_Mem_Map::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mem_Map::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -64,6 +65,7 @@ ACE_Mem_Map::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nclose_handle_ = %d"), this->close_handle_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index e05e54cf19f..c33b0bc9080 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -22,7 +22,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool)
 void
 ACE_Local_Memory_Pool::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Local_Memory_Pool::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Local_Memory_Pool::ACE_Local_Memory_Pool (const ACE_TCHAR *,
@@ -88,7 +90,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_MMAP_Memory_Pool)
 void
 ACE_MMAP_Memory_Pool::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_MMAP_Memory_Pool::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
@@ -593,7 +597,9 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes,
 void
 ACE_Sbrk_Memory_Pool::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sbrk_Memory_Pool::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Sbrk_Memory_Pool::ACE_Sbrk_Memory_Pool (const ACE_TCHAR *,
@@ -628,7 +634,9 @@ ACE_Shared_Memory_Pool_Options::ACE_Shared_Memory_Pool_Options (const char *base
 void
 ACE_Shared_Memory_Pool::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_Pool::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index f6b748fe9f9..dd76ee89d63 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -133,6 +133,7 @@ ACE_Message_Block::crunch (void)
 void
 ACE_Data_Block::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Data_Block::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
@@ -154,11 +155,13 @@ ACE_Data_Block::dump (void) const
               this->reference_count_));
   this->allocator_strategy_->dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Message_Block::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Block::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,
@@ -178,6 +181,7 @@ ACE_Message_Block::dump (void) const
               this->wr_ptr_));
   this->data_block ()->dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
@@ -1215,6 +1219,7 @@ ACE_Dynamic_Message_Strategy::~ACE_Dynamic_Message_Strategy (void)
 void
 ACE_Dynamic_Message_Strategy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -1239,6 +1244,7 @@ ACE_Dynamic_Message_Strategy::dump (void) const
               this->pending_shift_.usec ()));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Deadline_Message_Strategy:: ACE_Deadline_Message_Strategy (unsigned long static_bit_field_mask,
@@ -1259,6 +1265,7 @@ ACE_Deadline_Message_Strategy::~ACE_Deadline_Message_Strategy (void)
 void
 ACE_Deadline_Message_Strategy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Deadline_Message_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -1269,6 +1276,7 @@ ACE_Deadline_Message_Strategy::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Laxity_Message_Strategy::ACE_Laxity_Message_Strategy (unsigned long static_bit_field_mask,
@@ -1289,6 +1297,7 @@ ACE_Laxity_Message_Strategy::~ACE_Laxity_Message_Strategy (void)
 void
 ACE_Laxity_Message_Strategy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Laxity_Message_Strategy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -1299,6 +1308,7 @@ ACE_Laxity_Message_Strategy::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
   // Dump the state of the strategy.
 
diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 1a35c1939fa..d60eb54204d 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -21,6 +21,7 @@ ACE_RCSID(ace, Message_Queue, "$Id$")
 void
 ACE_Message_Queue_Vx::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_Vx::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   switch (this->state_)
@@ -54,6 +55,7 @@ ACE_Message_Queue_Vx::dump (void) const
               this->head_,
               this->tail_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages,
@@ -470,6 +472,7 @@ ACE_Message_Queue_NT::pulse (void)
 void
 ACE_Message_Queue_NT::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_NT::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -503,6 +506,7 @@ ACE_Message_Queue_NT::dump (void) const
               this->cur_count_,
               this->completion_port_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 9e7cb2cf650..475aa6580fe 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -27,9 +27,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue_Ex)
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> void
 ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dump");
 
   this->queue_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> void
@@ -376,6 +378,8 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::advance (void)
 template <ACE_SYNCH_DECL> void
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue_Iterator)
@@ -422,11 +426,14 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::advance (void)
 template <ACE_SYNCH_DECL> void
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> void
 ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   switch (this->state_)
@@ -464,6 +471,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("not_empty_cond: \n")));
   not_empty_cond_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> void
@@ -1599,6 +1607,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&firs
 template <ACE_SYNCH_DECL> void
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
@@ -1623,6 +1632,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const
   message_strategy_.dump ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
   // dump the state of the queue
 
diff --git a/ace/Module.cpp b/ace/Module.cpp
index dec2486f12a..5e4646ef8c4 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -23,7 +23,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Module)
 template <ACE_SYNCH_DECL> void
 ACE_Module<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> void
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp
index cccd599912c..2d304d19f78 100644
--- a/ace/Name_Proxy.cpp
+++ b/ace/Name_Proxy.cpp
@@ -9,6 +9,7 @@ ACE_RCSID(ace, Name_Proxy, "$Id$")
 void
 ACE_Name_Proxy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Proxy::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -16,6 +17,7 @@ ACE_Name_Proxy::dump (void) const
   this->peer_.dump ();
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("reactor_ = %x"), this->reactor_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Default constructor.
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp
index 03928be00c7..4d2d90d317a 100644
--- a/ace/Name_Request_Reply.cpp
+++ b/ace/Name_Request_Reply.cpp
@@ -321,6 +321,7 @@ ACE_Name_Request::decode (void)
 void
 ACE_Name_Request::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Request::dump");
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("*******\nlength = %d\n"),
@@ -399,6 +400,7 @@ ACE_Name_Request::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("+++++++\n")));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Default constructor.
@@ -534,6 +536,7 @@ ACE_Name_Reply::decode (void)
 void
 ACE_Name_Reply::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Name_Reply::dump");
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"),
@@ -557,4 +560,5 @@ ACE_Name_Reply::dump (void) const
                   this->msg_type ()));
       break;
     }
+#endif /* ACE_HAS_DUMP */
 }
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index c3d682592c8..a3a04e65210 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -387,8 +387,10 @@ ACE_Naming_Context::~ACE_Naming_Context (void)
 void
 ACE_Naming_Context::dump ()
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Naming_Context::dump");
   this->name_space_->dump();
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 257219ff086..d18a5bce379 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -905,6 +905,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
 void
 ACE_OS::ace_flock_t::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump");
 
 #if 0
@@ -923,6 +924,7 @@ ACE_OS::ace_flock_t::dump (void) const
 #endif /* ACE_WIN32 */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* 0 */
+#endif /* ACE_HAS_DUMP */
 }
 
 void
@@ -1713,6 +1715,7 @@ ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const
 void
 ACE_TSS_Info::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   //  ACE_OS_TRACE ("ACE_TSS_Info::dump");
 
 #if 0
@@ -1722,6 +1725,7 @@ ACE_TSS_Info::dump (void)
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("tss_obj_ = %u\n"), this->tss_obj_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* 0 */
+#endif /* ACE_HAS_DUMP */
 }
 
 // Moved class ACE_TSS_Keys declaration to OS.h so it can be visible
@@ -2162,6 +2166,7 @@ ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
 void
 ACE_TSS_Cleanup::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   // Iterate through all the thread-specific items and dump them all.
 
   ACE_TSS_TABLE_ITERATOR key_info = table_;
@@ -2169,6 +2174,7 @@ ACE_TSS_Cleanup::dump (void)
        i < ACE_DEFAULT_THREAD_KEYS;
        ++key_info, ++i)
     key_info->dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TSS_Keys *
diff --git a/ace/Obchunk.cpp b/ace/Obchunk.cpp
index 5143a07a20c..8ed416c8b68 100644
--- a/ace/Obchunk.cpp
+++ b/ace/Obchunk.cpp
@@ -13,12 +13,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk)
 void
 ACE_Obchunk::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obchunk::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("end_ = %x\n"), this->end_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("cur_ = %x\n"), this->cur_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Obchunk::ACE_Obchunk (size_t size)
diff --git a/ace/Obstack_T.cpp b/ace/Obstack_T.cpp
index cb96dd40a13..1f9104bd002 100644
--- a/ace/Obstack_T.cpp
+++ b/ace/Obstack_T.cpp
@@ -20,6 +20,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Obstack_T)
 template <class CHAR> void
 ACE_Obstack_T<CHAR>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Obstack_T<CHAR>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -27,6 +28,7 @@ ACE_Obstack_T<CHAR>::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("head_ = %x\n"), this->head_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("curr_ = %x\n"), this->curr_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class CHAR> int
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
index 031d8b53d7e..2c8b503cd99 100644
--- a/ace/PI_Malloc.cpp
+++ b/ace/PI_Malloc.cpp
@@ -21,17 +21,20 @@ ACE_RCSID (ace,
 void
 ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 {
+#if defined (ACE_HAS_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_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_PI_Control_Block::print_alignment_info (void)
 {
+#if defined (ACE_HAS_DUMP)
   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,
@@ -61,11 +64,13 @@ ACE_PI_Control_Block::print_alignment_info (void)
               sizeof (ACE_PI_Control_Block)
               ));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n")));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_PI_Control_Block::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -86,6 +91,7 @@ ACE_PI_Control_Block::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
@@ -137,6 +143,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -148,6 +155,7 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
               (const char *) this->name_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index b215a3837e4..42db7a3ac25 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -26,7 +26,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Stream_Node)
 void
 ACE_Stream_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 void
@@ -50,7 +52,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Parse_Node)
 void
 ACE_Parse_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Parse_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 const ACE_TCHAR *
@@ -143,7 +147,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Suspend_Node)
 void
 ACE_Suspend_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Suspend_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Suspend_Node::ACE_Suspend_Node (const ACE_TCHAR *name)
@@ -157,7 +163,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Resume_Node)
 void
 ACE_Resume_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Resume_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Resume_Node::ACE_Resume_Node (const ACE_TCHAR *name)
@@ -200,7 +208,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Remove_Node)
 void
 ACE_Remove_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remove_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Remove_Node::ACE_Remove_Node (const ACE_TCHAR *name)
@@ -259,7 +269,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Dynamic_Node)
 void
 ACE_Dynamic_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dynamic_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Dynamic_Node::~ACE_Dynamic_Node (void)
@@ -272,7 +284,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Static_Node)
 void
 ACE_Static_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Static_Node::ACE_Static_Node (const ACE_TCHAR *nm,
@@ -330,7 +344,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Location_Node)
 void
 ACE_Location_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Location_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Location_Node::ACE_Location_Node (void)
@@ -405,7 +421,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Object_Node)
 void
 ACE_Object_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Object_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Object_Node::ACE_Object_Node (const ACE_TCHAR *path,
@@ -456,7 +474,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Function_Node)
 void
 ACE_Function_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Function_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Function_Node::ACE_Function_Node (const ACE_TCHAR *path,
@@ -532,7 +552,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Dummy_Node)
 void
 ACE_Dummy_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Dummy_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Dummy_Node::ACE_Dummy_Node (const ACE_Static_Node *static_node,
@@ -572,7 +594,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Static_Function_Node)
 void
 ACE_Static_Function_Node::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Static_Function_Node::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Static_Function_Node::ACE_Static_Function_Node (const ACE_TCHAR *func_name)
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 63979297e4b..d6ecb3641ad 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -14,12 +14,14 @@ ACE_RCSID(ace, Pipe, "$Id$")
 void
 ACE_Pipe::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Pipe::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handles_[0] = %d"), this->handles_[0]));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandles_[1] = %d"), this->handles_[1]));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Priority_Reactor.cpp b/ace/Priority_Reactor.cpp
index fd66ba55e7d..e52aabd626f 100644
--- a/ace/Priority_Reactor.cpp
+++ b/ace/Priority_Reactor.cpp
@@ -143,6 +143,7 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles,
 void
 ACE_Priority_Reactor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Priority_Reactor::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -150,6 +151,7 @@ ACE_Priority_Reactor::dump (void) const
   ACE_Select_Reactor::dump ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 629843f798f..8e7b2307d9b 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -57,6 +57,7 @@ ACE_Process_Descriptor::~ACE_Process_Descriptor (void)
 void
 ACE_Process_Descriptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Descriptor::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -65,11 +66,13 @@ ACE_Process_Descriptor::dump (void) const
                           this->process_->getpid( )));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Process_Manager::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Manager::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -81,6 +84,7 @@ ACE_Process_Manager::dump (void) const
     this->process_table_[i].dump ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Process_Descriptor::ACE_Process_Descriptor (void)
diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp
index 7e60a9f33db..551887405de 100644
--- a/ace/Process_Mutex.cpp
+++ b/ace/Process_Mutex.cpp
@@ -16,10 +16,12 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex)
 void
 ACE_Process_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Mutex::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 const ACE_TCHAR *
diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp
index ebc036b509b..81a3fd1d07f 100644
--- a/ace/Process_Semaphore.cpp
+++ b/ace/Process_Semaphore.cpp
@@ -12,10 +12,12 @@ ACE_RCSID(ace, Process_Semaphore, "$Id$")
 void
 ACE_Process_Semaphore::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Semaphore::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index 2f4ef9f8f87..4beedd397f0 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
 void
 ACE_Profile_Timer::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Profile_Timer::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Initialize interval timer.
@@ -260,8 +262,10 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
 void
 ACE_Profile_Timer::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Profile_Timer::dump");
   timer_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // Initialize interval timer.
@@ -364,8 +368,10 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0)
 void
 ACE_Profile_Timer::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Profile_Timer::dump");
   timer_.dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Profile_Timer::ACE_Profile_Timer (void)
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 9d9bc2d9b94..4a83edfdb4e 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -811,6 +811,7 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::
 dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const
 {
+#if defined (ACE_HAS_DUMP)
   if (node)
     {
       dump_node_i (*node);
@@ -827,6 +828,7 @@ dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const
     {
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nNULL POINTER (BLACK)\n")));
     }
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -838,10 +840,12 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::
 dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const
 {
+#if defined (ACE_HAS_DUMP)
   const char * color_str = (node.color () == ACE_RB_Tree_Node_Base::RED)
                            ? "RED" : "BLACK";
 
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT (" color=[%s]\n"), color_str));
+#endif /* ACE_HAS_DUMP */
 }
 
 /// Tests the red-black invariant(s) throughout the whole tree.
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index ed0a93fbb7e..90cd0b35019 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -571,6 +571,7 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
 ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_));
@@ -579,6 +580,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nDumping nodes from root\n")));
   this->dump_i (this->root_);
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -863,9 +865,11 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
 ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
 
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -1066,9 +1070,11 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
 ACE_INLINE void
 ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
 
   this->dump_i ();
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/README b/ace/README
index 69bc1c70dee..c05ed540432 100644
--- a/ace/README
+++ b/ace/README
@@ -17,6 +17,10 @@ http://www.cs.wustl.edu/~othman/aceconf/.
 Macro                                   Description
 -----                                   -----------
 
+ACE_HAS_DUMP                            Used to enable the dump() method bodies.
+                                        If not defined, the bodies are ifdef out
+                                        in order to reduce footprint.  By default,
+                                        it is not defined.
 ACE_CAST_CONST                          Used to work around broken
                                         SunCC ANSI casts that require
                                         an extra const.
diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp
index 1b0aee4eb28..ec3e8af7082 100644
--- a/ace/RW_Process_Mutex.cpp
+++ b/ace/RW_Process_Mutex.cpp
@@ -39,10 +39,12 @@ ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void)
 void
 ACE_RW_Process_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Process_Mutex::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->lock_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 18922660461..3dbc60d855d 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -302,9 +302,11 @@ ACE_Reactor::resumable_handler (void)
 void
 ACE_Reactor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Reactor::dump");
 
   implementation_->dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index 5f38190caa6..34b38e54634 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -14,6 +14,7 @@ ACE_RCSID(ace, Read_Buffer, "$Id$")
 void
 ACE_Read_Buffer::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Read_Buffer::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("size_ = %d"), this->size_));
@@ -21,6 +22,7 @@ ACE_Read_Buffer::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nstream_ = %x"), this->stream_));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nallocator_ = %x"), this->allocator_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp
index 98bf76cc2a2..f3cb55a2f83 100644
--- a/ace/Registry_Name_Space.cpp
+++ b/ace/Registry_Name_Space.cpp
@@ -282,6 +282,8 @@ ACE_Registry_Name_Space::list_type_entries (ACE_BINDING_SET &set,
 void
 ACE_Registry_Name_Space::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index 66c05cbab1e..ce1af622d17 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -364,11 +364,13 @@ ACE_Remote_Name_Space::~ACE_Remote_Name_Space (void)
 void
 ACE_Remote_Name_Space::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Name_Space::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->ns_proxy_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 86aec7547d8..218de1b254c 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -81,6 +81,7 @@ ACE_TSS_Connection::operator ACE_SOCK_Stream *(void)
 void
 ACE_TSS_Connection::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_Connection::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_TSS_Connection::dump:\n")));
@@ -89,6 +90,7 @@ ACE_TSS_Connection::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_TSS<ACE_SOCK_Stream>::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Remote_Token_Proxy::ACE_Remote_Token_Proxy (void)
@@ -384,6 +386,7 @@ ACE_Remote_Token_Proxy::owner_id (void)
 void
 ACE_Remote_Token_Proxy::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   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")
@@ -392,39 +395,46 @@ ACE_Remote_Token_Proxy::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Remote_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_Mutex::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Remote_Mutex::dump:\n")));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Remote_RLock::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_RLock::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Remote_RLock::dump:\n")));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Remote_WLock::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Remote_WLock::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Remote_WLock::dump:\n")));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_Remote_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/SOCK.cpp b/ace/SOCK.cpp
index 333ff6c16b5..2d17363dcf1 100644
--- a/ace/SOCK.cpp
+++ b/ace/SOCK.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK)
 void
 ACE_SOCK::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_SOCK::ACE_SOCK (void)
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index a07834ba6bc..8ab06f01694 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -207,7 +207,9 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 void
 ACE_SOCK_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp
index 217257158fe..78bc2401178 100644
--- a/ace/SOCK_CODgram.cpp
+++ b/ace/SOCK_CODgram.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram)
 void
 ACE_SOCK_CODgram::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_CODgram::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Here's the general-purpose constructor.
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 7f2b54fba2e..1f48051b260 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -20,7 +20,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector)
 void
 ACE_SOCK_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index d9814ed508b..6d8377a55c2 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -18,7 +18,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram)
 void
 ACE_SOCK_Dgram::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Allows a client to read from a socket without having to provide a
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 107344e657f..560545fd0b6 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -23,7 +23,9 @@ ACE_Bcast_Node::ACE_Bcast_Node (ACE_INET_Addr &addr,
 void
 ACE_SOCK_Dgram_Bcast::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram_Bcast::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Close up and release resources.
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index de41a4790fd..2aaff6d51ab 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -54,6 +54,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_SOCK_Dgram_Mcast)
 void
 ACE_SOCK_Dgram_Mcast::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -111,6 +112,7 @@ ACE_SOCK_Dgram_Mcast::dump (void) const
     }
 # endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Constructor.
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index 34ec0ca9fae..83d13192be0 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO)
 void
 ACE_SOCK_IO::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_IO::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Allows a client to read from a socket without having to provide
diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp
index a6622889215..c73d6e70985 100644
--- a/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/ace/SOCK_SEQPACK_Acceptor.cpp
@@ -151,7 +151,9 @@ ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association
 void
 ACE_SOCK_SEQPACK_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp
index f0a1ec6c392..b1c79c2050c 100644
--- a/ace/SOCK_SEQPACK_Association.cpp
+++ b/ace/SOCK_SEQPACK_Association.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association)
 void
 ACE_SOCK_SEQPACK_Association::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Association::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp
index 1fe36508a41..c0b04d1348f 100644
--- a/ace/SOCK_SEQPACK_Connector.cpp
+++ b/ace/SOCK_SEQPACK_Connector.cpp
@@ -17,7 +17,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector)
 void
 ACE_SOCK_SEQPACK_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp
index cd9be127aaa..287cb2add65 100644
--- a/ace/SOCK_Stream.cpp
+++ b/ace/SOCK_Stream.cpp
@@ -14,7 +14,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Stream)
 void
 ACE_SOCK_Stream::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SOCK_Stream::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp
index 0f2be4cc65d..eafbc05925f 100644
--- a/ace/SPIPE.cpp
+++ b/ace/SPIPE.cpp
@@ -21,7 +21,9 @@ ACE_SPIPE::ACE_SPIPE (void)
 void
 ACE_SPIPE::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Close down a ACE_SPIPE. 
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index 49be0efb68f..3728004dfe8 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -35,7 +35,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_SPIPE_Acceptor)
 void
 ACE_SPIPE_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // General purpose routine for performing server ACE_SPIPE creation.
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 958024ad949..b234e9e3882 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -14,6 +14,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr)
 void
 ACE_SPIPE_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 // Set a pointer to the address.
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 60954a4a6d3..8a20df75d28 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -35,7 +35,9 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
 void
 ACE_SPIPE_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_SPIPE_Connector::ACE_SPIPE_Connector (void)
diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp
index 20385f02c33..7717db32ca5 100644
--- a/ace/SPIPE_Stream.cpp
+++ b/ace/SPIPE_Stream.cpp
@@ -14,7 +14,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream)
 void
 ACE_SPIPE_Stream::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SPIPE_Stream::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Simple-minded do nothing constructor.
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 88fad2ae74c..c626a94c7b1 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -355,7 +355,9 @@ ACE_NS_WString::ACE_NS_WString (const ACE_USHORT16 *s,
 void
 ACE_SString::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SString::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Copy constructor.
diff --git a/ace/SV_Message.cpp b/ace/SV_Message.cpp
index fef83458651..7de4d2e1179 100644
--- a/ace/SV_Message.cpp
+++ b/ace/SV_Message.cpp
@@ -14,6 +14,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message)
 void
 ACE_SV_Message::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Message::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp
index d9f924e82eb..4ea8d69e821 100644
--- a/ace/SV_Message_Queue.cpp
+++ b/ace/SV_Message_Queue.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue)
 void
 ACE_SV_Message_Queue::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Message_Queue::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_SV_Message_Queue::ACE_SV_Message_Queue (void)
diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp
index 626d91bb4b8..f8a3cdb504d 100644
--- a/ace/SV_Semaphore_Complex.cpp
+++ b/ace/SV_Semaphore_Complex.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex)
 void
 ACE_SV_Semaphore_Complex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Semaphore_Complex::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // initial value of process
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 8a130430af9..fa1ca90eb0e 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -17,7 +17,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple)
 void
 ACE_SV_Semaphore_Simple::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Semaphore_Simple::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/SV_Shared_Memory.cpp b/ace/SV_Shared_Memory.cpp
index dfa73d99c67..7bf96fb1d6f 100644
--- a/ace/SV_Shared_Memory.cpp
+++ b/ace/SV_Shared_Memory.cpp
@@ -15,7 +15,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory)
 void
 ACE_SV_Shared_Memory::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_SV_Shared_Memory::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Creates a shared memory segment of SIZE bytes and *does* attach to
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index 3092841d31b..9018a2c9e53 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -504,17 +504,20 @@ ACE_Select_Reactor_Handler_Repository_Iterator::advance (void)
 void
 ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rep_ = %u"), this->rep_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %d"), this->current_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
 ACE_Select_Reactor_Handler_Repository::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -533,6 +536,7 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_Handler_Repository_Iterator)
@@ -669,12 +673,14 @@ ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
 void
 ACE_Select_Reactor_Notify::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_Notify::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("select_reactor_ = %x"), this->select_reactor_));
   this->notification_pipe_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 74791845f84..7391f687bc2 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -188,11 +188,13 @@ 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
 {
+#if defined (ACE_HAS_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")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX>
@@ -1530,6 +1532,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
 template <class ACE_SELECT_REACTOR_TOKEN> void
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Select_Reactor_T::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -1584,5 +1587,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const
 #endif /* ACE_MT_SAFE */
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 #endif /* ACE_SELECT_REACTOR_T_C */
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 6a9330927b9..a9536b7f514 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -29,7 +29,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Service_Config)
 void
 ACE_Service_Config::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Config::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // All the factory functions that allocate default statically linked
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 8d9ce8468a2..40437aab625 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -22,7 +22,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Service_Manager)
 void
 ACE_Service_Manager::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Manager::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Static variables.
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index e370e21024f..b757df4ac32 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -17,7 +17,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type)
 void
 ACE_Service_Type::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Type::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 125c2e77b87..c438a6b05e4 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -23,7 +23,9 @@ int ACE_Service_Repository::delete_svc_rep_ = 0;
 void
 ACE_Service_Repository::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Repository::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Service_Repository::ACE_Service_Repository (void)
@@ -354,7 +356,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Service_Repository_Iterator)
 void
 ACE_Service_Repository_Iterator::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Repository_Iterator::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Initializes the iterator and skips over any suspended entries at
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index a39d163fa60..f29bc9205c7 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -19,7 +19,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl)
 void
 ACE_Service_Type_Impl::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Service_Type_Impl::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Service_Type_Impl::ACE_Service_Type_Impl (void *so,
@@ -102,7 +104,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Module_Type)
 void
 ACE_Module_Type::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Module_Type::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Module_Type::ACE_Module_Type (void *m,
@@ -222,7 +226,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Type)
 void
 ACE_Stream_Type::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Type::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Shared_Memory_MM.cpp b/ace/Shared_Memory_MM.cpp
index 85778fbdf07..53b260fe399 100644
--- a/ace/Shared_Memory_MM.cpp
+++ b/ace/Shared_Memory_MM.cpp
@@ -14,7 +14,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_MM)
 void
 ACE_Shared_Memory_MM::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_MM::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Creates a shared memory segment of SIZE bytes.
diff --git a/ace/Shared_Memory_SV.cpp b/ace/Shared_Memory_SV.cpp
index bd8dba00a8a..f3bcf4653e1 100644
--- a/ace/Shared_Memory_SV.cpp
+++ b/ace/Shared_Memory_SV.cpp
@@ -14,7 +14,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Shared_Memory_SV)
 void
 ACE_Shared_Memory_SV::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Shared_Memory_SV::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index cdeb7011f41..349efeb6ec1 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -55,7 +55,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Action)
 void
 ACE_Sig_Action::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Action::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Set)
@@ -63,7 +65,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Set)
 void
 ACE_Sig_Set::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Set::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Guard)
@@ -71,7 +75,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Guard)
 void
 ACE_Sig_Guard::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Guard::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Sig_Action::ACE_Sig_Action (void)
@@ -223,7 +229,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler)
 void
 ACE_Sig_Handler::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Handler::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
@@ -560,7 +568,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers)
 void
 ACE_Sig_Handlers::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Sig_Handlers::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // This is the method that does all the dirty work...  The basic
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index f76472c997f..a1b19187964 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -25,6 +25,7 @@ ACE_RCSID (ace,
 template <class TYPE, class ACE_LOCK> void
 ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
@@ -32,6 +33,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void)
               ACE_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *&
@@ -119,6 +121,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0;
 template <class TYPE, class ACE_LOCK> void
 ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
@@ -126,6 +129,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void)
               ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class ACE_LOCK>
@@ -207,6 +211,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void)
 template <class TYPE, class ACE_LOCK> void
 ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
@@ -214,6 +219,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
               ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton<TYPE, ACE_LOCK> *&
@@ -293,6 +299,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
 template <class TYPE, class ACE_LOCK> void
 ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
@@ -300,6 +307,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void)
               ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class ACE_LOCK>
@@ -397,6 +405,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::singleton_ = 0;
 template <class TYPE, class ACE_LOCK> void
 ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump");
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
@@ -404,6 +413,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void)
               ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i ()));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class ACE_LOCK>
diff --git a/ace/Stats.i b/ace/Stats.i
index c97c0d29ca6..bafa86161e8 100644
--- a/ace/Stats.i
+++ b/ace/Stats.i
@@ -55,9 +55,11 @@ ACE_INLINE
 void
 ACE_Stats_Value::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"),
               precision_, whole_, fractional_));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_INLINE
@@ -91,5 +93,7 @@ ACE_INLINE
 void
 ACE_Stats::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   print_summary (3u);
+#endif /* ACE_HAS_DUMP */
 }
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index eec7d86d135..f7225976bf0 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -1145,80 +1145,104 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find (
 template <class SVC_HANDLER> void
 ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Concurrency_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Reactive_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Thread_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void
 ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void
 ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Process_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump");
 
   ACE_Scheduling_Strategy<SVC_HANDLER>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump");
 
   ACE_Scheduling_Strategy<SVC_HANDLER>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> ACE_INLINE void
 ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class SVC_HANDLER> void
 ACE_Creation_Strategy<SVC_HANDLER>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Creation_Strategy)
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index fb9ba6e09b3..c49d0f4d568 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -26,6 +26,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Stream)
 template <ACE_SYNCH_DECL> void
 ACE_Stream<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::dump");
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("-------- module links --------\n")));
 
@@ -66,6 +67,7 @@ ACE_Stream<ACE_SYNCH_USE>::dump (void) const
               && tp == this->linked_us_->stream_head_->writer ()))
         break;
     }
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp
index 84527422c72..71681344db7 100644
--- a/ace/Stream_Modules.cpp
+++ b/ace/Stream_Modules.cpp
@@ -29,7 +29,9 @@ ACE_Stream_Head<ACE_SYNCH_USE>::~ACE_Stream_Head (void)
 template <ACE_SYNCH_DECL> void
 ACE_Stream_Head<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // ACE_Module that act as the head and tail of a Stream.
@@ -167,7 +169,9 @@ ACE_Stream_Tail<ACE_SYNCH_USE>::~ACE_Stream_Tail (void)
 template <ACE_SYNCH_DECL> void
 ACE_Stream_Tail<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> int
@@ -308,7 +312,9 @@ ACE_Thru_Task<ACE_SYNCH_USE>::~ACE_Thru_Task (void)
 template <ACE_SYNCH_DECL> void
 ACE_Thru_Task<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <ACE_SYNCH_DECL> int
diff --git a/ace/String_Base.i b/ace/String_Base.i
index 828e8b933c7..f35a1378bc4 100644
--- a/ace/String_Base.i
+++ b/ace/String_Base.i
@@ -113,7 +113,9 @@ ACE_String_Base<CHAR>::~ACE_String_Base (void)
 template <class CHAR> ACE_INLINE void
 ACE_String_Base<CHAR>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_String_Base<CHAR>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Assignment operator (does copy memory).
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index d16028e7078..5576790eb9a 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -226,6 +226,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint (void **act_holder)
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
 
   this->peer_.dump ();
@@ -241,6 +242,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
   ACE_DEBUG ((LM_DEBUG,
               "recycling_act_ = %d\n",
               this->recycling_act_));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> ACE_PEER_STREAM &
@@ -480,6 +482,7 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void)
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
 
   ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump ();
@@ -494,6 +497,7 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
                 "next_timeout_.sec = %d, next_timeout_.usec = %d\n",
                 this->next_timeout_.sec (),
                 this->next_timeout_.usec ()));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> int
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 3f29c95f3ea..9b1d8cb4561 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -94,7 +94,9 @@ ACE_Adaptive_Lock::tryacquire_write_upgrade (void)
 void
 ACE_Adaptive_Lock::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   //  return this->lock_->dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f)
@@ -130,11 +132,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Semaphore)
 void
 ACE_Semaphore::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Semaphore::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Semaphore::ACE_Semaphore (u_int count,
@@ -174,6 +178,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Mutex)
 void
 ACE_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -183,6 +188,7 @@ ACE_Mutex::dump (void) const
 #endif /* CHORUS */
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
@@ -347,8 +353,10 @@ ACE_Event::reset (void)
 void
 ACE_Event::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Manual_Event::ACE_Manual_Event (int initial_state,
@@ -380,7 +388,9 @@ ACE_Manual_Event::ACE_Manual_Event (int initial_state,
 void
 ACE_Manual_Event::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_Event::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Auto_Event::ACE_Auto_Event (int initial_state,
@@ -412,7 +422,9 @@ ACE_Auto_Event::ACE_Auto_Event (int initial_state,
 void
 ACE_Auto_Event::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_Event::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_THREADS)
@@ -422,9 +434,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex_Guard)
 void
 ACE_Thread_Semaphore::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Semaphore::dump");
 
   ACE_Semaphore::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Thread_Semaphore::ACE_Thread_Semaphore (u_int count,
@@ -440,11 +454,13 @@ ACE_Thread_Semaphore::ACE_Thread_Semaphore (u_int count,
 void
 ACE_Thread_Mutex_Guard::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Mutex_Guard::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 #endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
 
@@ -561,10 +577,12 @@ ACE_Recursive_Thread_Mutex::tryacquire (void)
 void
 ACE_Recursive_Thread_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex)
@@ -572,6 +590,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex)
 void
 ACE_Condition_Thread_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition_Thread_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -582,6 +601,7 @@ ACE_Condition_Thread_Mutex::dump (void) const
               this->cond_.waiters ()));
 #endif /* ACE_WIN32 */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m,
@@ -682,6 +702,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier)
 void
 ACE_Sub_Barrier::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Sub_Barrier::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -689,6 +710,7 @@ ACE_Sub_Barrier::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("running_threads_ = %d"), this->running_threads_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Sub_Barrier::ACE_Sub_Barrier (u_int count,
@@ -708,6 +730,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Process_Barrier)
 void
 ACE_Barrier::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Barrier::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -717,6 +740,7 @@ ACE_Barrier::dump (void) const
   this->sub_barrier_1_.dump ();
   this->sub_barrier_2_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Barrier::ACE_Barrier (u_int count,
@@ -778,8 +802,10 @@ ACE_Thread_Barrier::ACE_Thread_Barrier (u_int count, const ACE_TCHAR *name)
 void
 ACE_Thread_Barrier::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Barrier::dump");
   ACE_Barrier::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 #if 0
@@ -792,16 +818,20 @@ ACE_Process_Barrier::ACE_Process_Barrier (u_int count, const ACE_TCHAR *name)
 void
 ACE_Process_Barrier::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Barrier::dump");
   ACE_Barrier::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class MUTEX> void
 ACE_Process_Condition<MUTEX>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Process_Condition<MUTEX>::dump");
 
   ACE_Condition<MUTEX>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class MUTEX>
@@ -819,11 +849,13 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex)
 void
 ACE_Thread_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Thread_Mutex::~ACE_Thread_Mutex (void)
@@ -849,11 +881,13 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg)
 void
 ACE_RW_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg)
@@ -884,8 +918,10 @@ ACE_RW_Thread_Mutex::ACE_RW_Thread_Mutex (const ACE_TCHAR *name,
 void
 ACE_RW_Thread_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_RW_Thread_Mutex::dump");
   ACE_RW_Mutex::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -899,6 +935,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void)
 void
 ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -907,6 +944,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
   this->mutex_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
diff --git a/ace/Synch.i b/ace/Synch.i
index 4aab9635745..b424bf2e3dd 100644
--- a/ace/Synch.i
+++ b/ace/Synch.i
@@ -452,6 +452,8 @@ ACE_Null_Semaphore::tryacquire_read (void)
 ACE_INLINE void
 ACE_Null_Semaphore::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_THREADS)
@@ -748,6 +750,8 @@ ACE_Null_Barrier::wait (void)
 ACE_INLINE void
 ACE_Null_Barrier::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_INLINE
@@ -832,6 +836,8 @@ ACE_Null_Mutex::tryacquire_read (void)
 ACE_INLINE void
 ACE_Null_Mutex::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_INLINE int
@@ -854,6 +860,8 @@ ACE_Noop_Token::renew (int, ACE_Time_Value *)
 ACE_INLINE void
 ACE_Noop_Token::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -910,6 +918,8 @@ ACE_Null_Condition::mutex (void)
 ACE_INLINE void
 ACE_Null_Condition::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
@@ -956,6 +966,8 @@ ACE_Null_Mutex_Guard::release (void)
 ACE_INLINE void
 ACE_Null_Mutex_Guard::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 #endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
 
diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp
index 0c7a1ba1951..af31388cd56 100644
--- a/ace/Synch_Options.cpp
+++ b/ace/Synch_Options.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE (ACE_Synch_Options)
 void
 ACE_Synch_Options::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Synch_Options::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 // Static initialization.
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 827927fa874..8ddd4f0af8f 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -39,12 +39,14 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 template <class ACE_LOCK> void
 ACE_Guard<ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_ = %x\n"), this->lock_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
@@ -52,8 +54,10 @@ ACE_Guard<ACE_LOCK>::dump (void) const
 template <class ACE_LOCK> void
 ACE_Write_Guard<ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Write_Guard<ACE_LOCK>::dump");
   ACE_Guard<ACE_LOCK>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 // ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
@@ -72,6 +76,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Condition)
 template <class MUTEX> void
 ACE_Condition<MUTEX>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Condition<MUTEX>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -81,6 +86,7 @@ ACE_Condition<MUTEX>::dump (void) const
 #endif /* CHORUS */
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class MUTEX>
@@ -95,9 +101,11 @@ ACE_Thread_Condition<MUTEX>::ACE_Thread_Condition (MUTEX &m,
 template <class MUTEX> void
 ACE_Thread_Condition<MUTEX>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_Thread_Condition<MUTEX>::dump");
 
   ACE_Condition<MUTEX>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class MUTEX>
@@ -272,6 +280,7 @@ ACE_TSS<TYPE>::make_TSS_TYPE (void) const
 template <class TYPE> void
 ACE_TSS<TYPE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_TSS<TYPE>::dump");
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -281,6 +290,7 @@ ACE_TSS<TYPE>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))
@@ -545,12 +555,14 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TSS_Guard)
 template <class ACE_LOCK> void
 ACE_TSS_Guard<ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d"), this->key_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class ACE_LOCK> void
@@ -796,8 +808,10 @@ ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write (void)
 template <class ACE_LOCK> void
 ACE_TSS_Write_Guard<ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::dump");
   ACE_TSS_Guard<ACE_LOCK>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class ACE_LOCK>
@@ -882,8 +896,10 @@ ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read (void)
 template <class ACE_LOCK> void
 ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 // ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::dump");
   ACE_TSS_Guard<ACE_LOCK>::dump ();
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 056bc09a0a3..2a07df957ff 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -19,7 +19,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TLI)
 void
 ACE_TLI::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TLI::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TLI::ACE_TLI (void)
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index 60b63359031..d3116be865e 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -56,7 +56,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Request_Queue)
 void
 ACE_TLI_Request_Queue::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TLI_Request_Queue::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
@@ -99,7 +101,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Acceptor)
 void
 ACE_TLI_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TLI_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TLI_Acceptor::ACE_TLI_Acceptor (void)
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 53491547734..6acf741f3ba 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -18,7 +18,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector)
 void
 ACE_TLI_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TLI_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TLI_Connector::ACE_TLI_Connector (void)
diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp
index 4a216137ea5..1b4248bffd1 100644
--- a/ace/TLI_Stream.cpp
+++ b/ace/TLI_Stream.cpp
@@ -19,7 +19,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream)
 void
 ACE_TLI_Stream::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_TLI_Stream::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_TLI_Stream::ACE_TLI_Stream (void)
diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp
index 88bc3a2bfc5..25359027fe2 100644
--- a/ace/Task_T.cpp
+++ b/ace/Task_T.cpp
@@ -22,6 +22,7 @@ ACE_RCSID(ace, Task_T, "$Id$")
 template <ACE_SYNCH_DECL> void
 ACE_Task<ACE_SYNCH_USE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
@@ -37,6 +38,7 @@ ACE_Task<ACE_SYNCH_USE>::dump (void) const
 #endif /* ACE_MT_SAFE */
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // If the user doesn't supply a ACE_Message_Queue pointer then we'll
diff --git a/ace/Thread_Control.cpp b/ace/Thread_Control.cpp
index c5828d61842..5415e74b687 100644
--- a/ace/Thread_Control.cpp
+++ b/ace/Thread_Control.cpp
@@ -21,7 +21,9 @@ ACE_RCSID(ace, Thread_Control, "$Id$")
 void
 ACE_Thread_Control::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_OS_TRACE ("ACE_Thread_Control::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index b9a2a26776e..d690da52fa9 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -40,6 +40,7 @@ ACE_Thread_Manager::set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr)
 void
 ACE_Thread_Manager::dump (void)
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Manager::dump");
   // Cast away const-ness of this in order to use its non-const lock_.
   ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
@@ -56,6 +57,7 @@ ACE_Thread_Manager::dump (void)
     iter.next ()->dump ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Thread_Descriptor::~ACE_Thread_Descriptor (void)
@@ -230,6 +232,7 @@ ACE_Thread_Descriptor::at_exit (void *object,
 void
 ACE_Thread_Descriptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Thread_Descriptor::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
@@ -241,6 +244,7 @@ ACE_Thread_Descriptor::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Thread_Descriptor::ACE_Thread_Descriptor (void)
diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp
index 689099f92dc..82499afdc87 100644
--- a/ace/Time_Request_Reply.cpp
+++ b/ace/Time_Request_Reply.cpp
@@ -157,6 +157,7 @@ ACE_Time_Request::decode (void)
 void
 ACE_Time_Request::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Time_Request::dump");
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\nlength = %d\n"),
               this->size ()));
@@ -185,4 +186,5 @@ ACE_Time_Request::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\ntime = %d\n"),
               this->time ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("+++++++\n")));
+#endif /* ACE_HAS_DUMP */
 }
diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp
index f783c135acc..a9153981576 100644
--- a/ace/Time_Value.cpp
+++ b/ace/Time_Value.cpp
@@ -152,6 +152,7 @@ ACE_Time_Value::operator FILETIME () const
 void
 ACE_Time_Value::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_OS_TRACE ("ACE_Time_Value::dump");
 #if 0
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -159,6 +160,7 @@ ACE_Time_Value::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 #endif /* 0 */
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index db0c090e1f0..973cdf316cd 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -348,6 +348,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::earliest_time (void) const
 template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> void
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Hash_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntable_size_ = %d"), this->table_size_));
@@ -359,6 +360,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // Reschedule a periodic timer.  This function must be called with the
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 12c48e7b534..5ef38cd70af 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -298,6 +298,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Heap_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
@@ -328,6 +329,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
                 this->timer_ids_[j]));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index f0a89c5aeb9..61ca96290e1 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -152,6 +152,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_List_T (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_List_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
@@ -166,6 +167,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), count));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index bcff7136756..0d5a2b8a5a6 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -30,6 +30,7 @@ ACE_RCSID(ace, Timer_Queue_T, "$Id$")
 template <class TYPE> void
 ACE_Timer_Node_T<TYPE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Node_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nact_ = %x"), this->act_));
@@ -39,6 +40,7 @@ ACE_Timer_Node_T<TYPE>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE>
@@ -146,11 +148,13 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_timeout (ACE_Time_Value *m
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Queue_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->timeout_.dump ();
   this->timer_skew_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index 35f0b27fa70..2ab1532bf0a 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -685,6 +685,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::recalc_earliest
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Timer_Wheel_T::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
@@ -708,6 +709,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
     }
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
diff --git a/ace/Token.cpp b/ace/Token.cpp
index f15de7d1fe4..8eec75126a5 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -23,6 +23,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Token)
 void
 ACE_Token::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -35,6 +36,7 @@ ACE_Token::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nin_use_ = %d"), this->in_use_));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnesting level = %d"), this->nesting_level_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_Token::ACE_Token_Queue_Entry::ACE_Token_Queue_Entry (ACE_Thread_Mutex &m,
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index 291a0f3a450..4335b93ffd3 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -276,6 +276,7 @@ ACE_Token_Collection::create_token (const ACE_TCHAR *)
 void
 ACE_Token_Collection::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Collection::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Token_Collection::dump:\n")
@@ -285,6 +286,7 @@ ACE_Token_Collection::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("base:\n")));
   ACE_Token_Proxy::dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp
index 69f2c8fd32b..111a6b2fc2f 100644
--- a/ace/Token_Invariants.cpp
+++ b/ace/Token_Invariants.cpp
@@ -138,6 +138,7 @@ ACE_Token_Invariant_Manager::rwlock_releasing (const ACE_TCHAR *token_name)
 void
 ACE_Token_Invariant_Manager::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Invariant_Manager::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("mutex_collection_:\n")));
@@ -145,6 +146,7 @@ ACE_Token_Invariant_Manager::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("rwlock_collection_:\n")));
   rwlock_collection_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 
@@ -263,10 +265,12 @@ ACE_Mutex_Invariants::operator= (const ACE_Mutex_Invariants &rhs)
 void
 ACE_Mutex_Invariants::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Mutex_Invariants::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("owners_ = %d\n"), owners_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // **************************************************
@@ -336,12 +340,14 @@ ACE_RWLock_Invariants::operator= (const ACE_RWLock_Invariants &rhs)
 void
 ACE_RWLock_Invariants::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_RWLock_Invariants::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("writers_ = %d\n"),
               "readers_ = %d\n",
               writers_, readers_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index d14871ab52c..b5be9397ea4 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -253,6 +253,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token)
 void
 ACE_Token_Manager::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Token_Manager::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Token_Manager::dump:\n")));
@@ -261,6 +262,7 @@ ACE_Token_Manager::dump (void) const
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("collection_\n")));
   collection_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index 9fecb01e443..7ff4f595f10 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -91,6 +91,7 @@ ACE_Token_Request::decode (void)
 void
 ACE_Token_Request::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"),
 	     this->length (), this->token_name (), this->client_id ()));
@@ -131,6 +132,7 @@ ACE_Token_Request::dump (void) const
 		 this->options ().timeout ().sec (), this->options ().timeout ().usec ()));
     }
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 // ************************************************************
@@ -170,9 +172,11 @@ ACE_Token_Reply::decode (void)
 void
 ACE_Token_Reply::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"),
 	     this->length (), this->errnum ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("arg = %d"), this->arg ()));
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Trace.cpp b/ace/Trace.cpp
index 5a0688ee4bd..25ad1d27022 100644
--- a/ace/Trace.cpp
+++ b/ace/Trace.cpp
@@ -29,6 +29,8 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Trace)
 void
 ACE_Trace::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 // Determine whether or not tracing is enabled
diff --git a/ace/Typed_SV_Message.cpp b/ace/Typed_SV_Message.cpp
index 6b4ae9024b0..ec75a1e4a5d 100644
--- a/ace/Typed_SV_Message.cpp
+++ b/ace/Typed_SV_Message.cpp
@@ -20,7 +20,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message)
 template <class T> void
 ACE_Typed_SV_Message<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Typed_SV_Message<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 #endif /* ACE_TYPED_SV_MESSAGE_C */
diff --git a/ace/Typed_SV_Message_Queue.cpp b/ace/Typed_SV_Message_Queue.cpp
index 1a0a3b99943..7277df343b4 100644
--- a/ace/Typed_SV_Message_Queue.cpp
+++ b/ace/Typed_SV_Message_Queue.cpp
@@ -24,7 +24,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Typed_SV_Message_Queue)
 template <class T> void
 ACE_Typed_SV_Message_Queue<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 13bb91e1db1..3ca05e46eb7 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -28,6 +28,8 @@ ACE_UNIX_Addr::set_addr (void *addr, int len)
 void
 ACE_UNIX_Addr::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
+#endif /* ACE_HAS_DUMP */
 }
 
 // Do nothing constructor. 
diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp
index 379155616f3..9569e75697c 100644
--- a/ace/UPIPE_Acceptor.cpp
+++ b/ace/UPIPE_Acceptor.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor)
 void
 ACE_UPIPE_Acceptor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Acceptor::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 /* Do nothing routine for constructor. */
diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp
index d2edc143a50..2f1b58a44ae 100644
--- a/ace/UPIPE_Connector.cpp
+++ b/ace/UPIPE_Connector.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector)
 void
 ACE_UPIPE_Connector::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Connector::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_UPIPE_Connector::ACE_UPIPE_Connector (void)
diff --git a/ace/UPIPE_Stream.cpp b/ace/UPIPE_Stream.cpp
index c66ccde36c9..2b634e82dc1 100644
--- a/ace/UPIPE_Stream.cpp
+++ b/ace/UPIPE_Stream.cpp
@@ -43,7 +43,9 @@ ACE_UPIPE_Stream::control (int cmd,
 void
 ACE_UPIPE_Stream::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_UPIPE_Stream::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 int 
diff --git a/ace/Unbounded_Queue.cpp b/ace/Unbounded_Queue.cpp
index c5aad55fd31..c827ff6738b 100644
--- a/ace/Unbounded_Queue.cpp
+++ b/ace/Unbounded_Queue.cpp
@@ -84,6 +84,7 @@ ACE_Unbounded_Queue<T>::end (void)
 template <class T> void
 ACE_Unbounded_Queue<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   //   ACE_TRACE ("ACE_Unbounded_Queue<T>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -102,6 +103,7 @@ ACE_Unbounded_Queue<T>::dump (void) const
     ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> void
@@ -322,7 +324,9 @@ ACE_Unbounded_Queue<T>::set (const T &item,
 template <class T> void
 ACE_Unbounded_Queue_Const_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -375,7 +379,9 @@ ACE_Unbounded_Queue_Const_Iterator<T>::next (T *&item)
 template <class T> void
 ACE_Unbounded_Queue_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp
index e1cf0708e6a..3ec5d679602 100644
--- a/ace/Unbounded_Set.cpp
+++ b/ace/Unbounded_Set.cpp
@@ -62,6 +62,7 @@ ACE_Unbounded_Set<T>::reset (void)
 template <class T> void
 ACE_Unbounded_Set<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unbounded_Set<T>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -80,6 +81,7 @@ ACE_Unbounded_Set<T>::dump (void) const
     ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %d\n"), count++));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> void
@@ -253,7 +255,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Iterator)
   template <class T> void
 ACE_Unbounded_Set_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -356,7 +360,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Const_Iterator)
 template <class T> void
 ACE_Unbounded_Set_Const_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Const_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
diff --git a/ace/Unbounded_Set_Ex.cpp b/ace/Unbounded_Set_Ex.cpp
index 2dedd6a5537..4721d77d660 100644
--- a/ace/Unbounded_Set_Ex.cpp
+++ b/ace/Unbounded_Set_Ex.cpp
@@ -62,6 +62,7 @@ ACE_Unbounded_Set_Ex<T>::reset (void)
 template <class T> void
 ACE_Unbounded_Set_Ex<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -80,6 +81,7 @@ ACE_Unbounded_Set_Ex<T>::dump (void) const
     ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("count = %d\n"), count++));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T> void
@@ -314,7 +316,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Iterator)
 template <class T> void
 ACE_Unbounded_Set_Ex_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
@@ -474,7 +478,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Ex_Const_Iterator)
 template <class T> void
 ACE_Unbounded_Set_Ex_Const_Iterator<T>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T>::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 template <class T>
diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp
index 734eab8a2fb..bde5994fb3c 100644
--- a/ace/Vector_T.cpp
+++ b/ace/Vector_T.cpp
@@ -45,12 +45,14 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem)
 template <class T, size_t DEFAULT_SIZE>
 void ACE_Vector<T, DEFAULT_SIZE>::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
 #if 0
   // Can't do this unless the vector is an object with a dump
   // function.
   for (size_t i = 0; i < this->size (); ++i)
     (*this)[i].dump ();
 #endif /* 0 */
+#endif /* ACE_HAS_DUMP */
 }
 
 #if 0
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 19e4cea62e0..11652d7b87a 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -991,6 +991,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void)
 void
 ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   size_t i = 0;
 
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::dump");
@@ -1049,6 +1050,7 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /************************************************************/
@@ -2286,6 +2288,7 @@ ACE_WFMO_Reactor::update_state (void)
 void
 ACE_WFMO_Reactor::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -2303,6 +2306,7 @@ ACE_WFMO_Reactor::dump (void) const
   this->timer_queue_->dump ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 int
@@ -2649,6 +2653,7 @@ ACE_WFMO_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh,
 void
 ACE_WFMO_Reactor_Notify::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   this->timer_queue_->dump ();
@@ -2656,6 +2661,7 @@ ACE_WFMO_Reactor_Notify::dump (void) const
               ACE_LIB_TEXT ("Max. iteration: %d\n"),
               this->max_notify_iterations_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 void
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index 472a2d20fdc..e8bf5ffd913 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -74,6 +74,7 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (Common_Info &common_info)
 ACE_INLINE void
 ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -107,6 +108,7 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const
               this->close_masks_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /************************************************************/
@@ -155,6 +157,7 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::reset (void)
 ACE_INLINE void
 ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -170,6 +173,7 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle
               this->suspend_entry_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /************************************************************/
@@ -224,6 +228,7 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset (void)
 ACE_INLINE void
 ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -239,6 +244,7 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const
               this->suspend_entry_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /************************************************************/
@@ -293,6 +299,7 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handl
 ACE_INLINE void
 ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
@@ -308,6 +315,7 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const
               this->resume_entry_));
 
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
 }
 
 /************************************************************/
diff --git a/ace/XTI_ATM_Mcast.cpp b/ace/XTI_ATM_Mcast.cpp
index 0892672635e..334167dbcf3 100644
--- a/ace/XTI_ATM_Mcast.cpp
+++ b/ace/XTI_ATM_Mcast.cpp
@@ -16,7 +16,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast)
 void
 ACE_XTI_ATM_Mcast::dump (void) const
 {
+#if defined (ACE_HAS_DUMP)
   ACE_TRACE ("ACE_XTI_ATM_Mcast::dump");
+#endif /* ACE_HAS_DUMP */
 }
 
 ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (void)
author	dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-07-27 20:48:28 +0000
committer	dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-07-27 20:48:28 +0000
commit	41ca832cf1f94eff93d38e0a67124b7a2d915a84 (patch)
tree	41ca1b5df67921f46f3cb4b73434c76c82006d06 /ace
parent	4879ded451b9dcd1a5e85d9e0e4bbd4fd634fecc (diff)
download	ATCD-41ca832cf1f94eff93d38e0a67124b7a2d915a84.tar.gz