Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

          *:
          Zapped trailing whitespaces using
          find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'

62 files changed, 156 insertions, 184 deletions

diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h
index f8131c19485..f9137d35b8d 100644
--- a/ACE/ASNMP/asnmp/address.h
+++ b/ACE/ASNMP/asnmp/address.h
@@ -99,7 +99,7 @@ class SIPAddress; // aka ipv6
 //----[ Address class ]-----------------------------------------------
 //--------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the abstract base class
  * Address. An Address is a unique network endpoint.
@@ -340,7 +340,7 @@ private:
 //---------[ UDP/IPv4 Address Class ]-------------------------------------
 //------------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the concrete class UdpAddress
  * A Udp Address consists of an IP Version 4 Address (IpAddress)
@@ -411,7 +411,7 @@ protected:
 //---------[ 802.3 MAC Address Class ]-------------------------------------
 //-------------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the concrete class MacAddress.
  * A Media Access Control Address consists of 48 bits as defined
@@ -474,7 +474,7 @@ protected:
 //---------[ Netbios Address Class ]--------------------------------------
 //------------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the concrete class NetbiosAddress.
  * The IBM/Microsoft address for NETBIOS, NETBEUI protocol transport.
@@ -536,7 +536,7 @@ protected:
 //---------[ DecNet Address Class ]---------------------------------------
 //------------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the concrete class DecNetAddress.
  * DecNet Phase ? address consists of two octets (CISCO-TC.my)
@@ -585,7 +585,7 @@ class  ASNMP_Export DecNetAddress : public Address
 //---------[ AppleTalk Address Class ]------------------------------------
 //------------------------------------------------------------------------
 /**
- * @class 
+ * @class
  *
  * @brief Defines the member functions for the concrete class DecNetAddress.
  * DecNet Phase ? address consists of two octets (CISCO-TC.my)
diff --git a/ACE/ASNMP/asnmp/transaction.h b/ACE/ASNMP/asnmp/transaction.h
index d114bd40d1f..682e254c3c2 100644
--- a/ACE/ASNMP/asnmp/transaction.h
+++ b/ACE/ASNMP/asnmp/transaction.h
@@ -7,7 +7,7 @@
  *
  *  $Id$
  *
- *  @brief 
+ *  @brief
  *
  *  @author Michael R. MacFaden port to ACE / use Reactor pattern
  */
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 37d5afe10ce..a8049707523 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 13 18:15:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          *:
+          Zapped trailing whitespaces using
+          find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
+
 Mon Sep 13 14:04:48 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         Reverted change below, not correct given new info from Adam
diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
index 1e5dddfaecd..d4f93f37eca 100644
--- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
+++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
@@ -38,7 +38,7 @@ namespace Kokyu
     typedef typename
     DSRT_Scheduler_Traits::QoSDescriptor_t DSRT_QoSDescriptor;
 
-    DSRT_Direct_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, 
+    DSRT_Direct_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy,
                                  int sched_scope);
 
     int init_i (const DSRT_ConfigInfo&);
diff --git a/ACE/Kokyu/Kokyu.h b/ACE/Kokyu/Kokyu.h
index 67cd6329c01..caa22af7f0b 100644
--- a/ACE/Kokyu/Kokyu.h
+++ b/ACE/Kokyu/Kokyu.h
@@ -35,7 +35,7 @@
 //#################################################################
 //Beware that this interface will be subject to change in the future
 //since this is the very initial release. We will be working on
-//trying to merge the DSRT and EC mechanisms in the future. If you 
+//trying to merge the DSRT and EC mechanisms in the future. If you
 //are a user of this interface, kindly let us know so that we can
 //coordinate with you when we refactor this interface.
 //##################################################################
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index e14357c352d..6442da5484b 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -1994,7 +1994,7 @@ public:
   // Define a "trait"
   typedef T TYPE;
   typedef ACE_Array_Iterator<T> ITERATOR;
-  
+
   /// Dynamically create an uninitialized array.
   /**
    * Initialize an empty array of the specified size using the provided
diff --git a/ACE/ace/Hash_Map_With_Allocator_T.h b/ACE/ace/Hash_Map_With_Allocator_T.h
index 1c2413ba3f2..c9559e5c9b5 100644
--- a/ACE/ace/Hash_Map_With_Allocator_T.h
+++ b/ACE/ace/Hash_Map_With_Allocator_T.h
@@ -42,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *     is meaningful!  That is why we need this wrapper, which
  *     insures that appropriate allocator pointer is in place for
  *     each call.
- * 
+ *
  *     At some point it would be a good idea to update this class to
  *     use the new "two allocator" technique provided by @c
  *     ACE_Hash_Map_Manager_Ex.
diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h
index f689cc2d1c3..42f376693e1 100644
--- a/ACE/ace/Message_Queue_Vx.h
+++ b/ACE/ace/Message_Queue_Vx.h
@@ -107,7 +107,7 @@ public:
    * the message block sizes.
    */
   virtual void message_bytes (size_t new_size);
-  
+
   /**
    * New value of the number of total length on the queue, i.e., sum
    * of the message block lengths.
diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
index d9c1944599b..ed959acb5e5 100644
--- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
@@ -50,7 +50,7 @@ namespace ACE
 
     protected:
       ACE_UINT64 value_;
-      
+
     private:
       void init (void);
       void fetch (ACE_UINT64& value) const;
diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
index 720d608965e..a0881a150ab 100644
--- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h
@@ -31,7 +31,7 @@
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
 #elif defined (__FreeBSD__) || defined (__Lynx__)
 #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
@@ -74,7 +74,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
index 2bcdf90ed06..59d7166c972 100644
--- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h
@@ -31,7 +31,7 @@
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
 #elif defined (__FreeBSD__) || defined (__Lynx__)
 #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
@@ -74,7 +74,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
index 307a90c351f..aae4e62405c 100644
--- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
+++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h
@@ -56,11 +56,11 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
-      
+
       /// Common code to the constructor and to clear_i().
       void init (void);
 
diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
index 3516450bab3..a656eb13911 100644
--- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
@@ -53,9 +53,9 @@ namespace ACE
 
     protected:
       ACE_UINT64 value_;
-      
+
     private:
-      /// Common code.      
+      /// Common code.
       void init (void);
 
     private:
diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
index 65f731e9d45..e7dd19db2a6 100644
--- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
+++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.h
@@ -56,7 +56,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/Monitor_Group.h b/ACE/ace/Monitor_Control/Monitor_Group.h
index 557170e2964..8f85734f825 100644
--- a/ACE/ace/Monitor_Control/Monitor_Group.h
+++ b/ACE/ace/Monitor_Control/Monitor_Group.h
@@ -44,7 +44,7 @@ namespace ACE
       void add_member (Monitor_Base* member);
 
       virtual void update (void);
-      
+
       /// These are overridden to be no-ops.
       virtual void receive (double data);
       virtual void receive (size_t data);
diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
index 8aa4e79c7ae..3d6ea0a4064 100644
--- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.h
@@ -44,7 +44,7 @@ namespace ACE
 
       /// Platform-specific implementation.
       void update_i (void);
-      
+
       /// Platform-specific reset.
       void clear_impl (void);
 
diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
index 40607ff1ce3..53d13479ac2 100644
--- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
+++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h
@@ -62,7 +62,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
index bda86565bff..47da6d7659a 100644
--- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h
@@ -31,7 +31,7 @@
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
 #elif defined (__FreeBSD__) || defined (__Lynx__)
 #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
@@ -74,7 +74,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
index 7643e4df798..8bb2c15ea34 100644
--- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
+++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h
@@ -31,7 +31,7 @@
 #include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h"
 #elif defined (__FreeBSD__) || defined (__Lynx__)
 #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h"
-#elif defined (__NetBSD__) || defined (__OpenBSD__) 
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
 #include "ace/Monitor_Control/BSD_Network_Interface_Monitor.h"
 #else
 #include "ace/Monitor_Control/Null_Network_Interface_Monitor.h"
@@ -74,7 +74,7 @@ namespace ACE
 
       /// Stores the default name, used if none is supplied by the user.
       static const char* default_name (void);
-      
+
     private:
       /// Overridden reset, calls platform-specific reset.
       virtual void clear_i (void);
diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
index 499227148cd..7fc974769ec 100644
--- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
@@ -46,7 +46,7 @@ namespace ACE
       /// network information about the system. To get the specific
       /// value we want to monitor, we just vary the lookup string.
       Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str);
-      
+
       /// Platform-specific implementation.
       void update_i (void);
 
@@ -55,10 +55,10 @@ namespace ACE
 
     protected:
       ACE_UINT64 value_;
-      
+
     private:
       /// Common code.
-      
+
       void init (void);
       void access_kstats (ACE_UINT64 &which_member);
       int check_ks_module (const unsigned long ks_instance,
@@ -66,7 +66,7 @@ namespace ACE
                            const char *max_str,
                            ACE_UINT64 *value_array,
                            ACE_UINT64 &which_member);
-                            
+
 
     private:
       static const unsigned long MAX_LO_INTERFACES = 5UL;
diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.h b/ACE/ace/Monitor_Control/Windows_Monitor.h
index 12c9f5733f5..9a00d24536e 100644
--- a/ACE/ace/Monitor_Control/Windows_Monitor.h
+++ b/ACE/ace/Monitor_Control/Windows_Monitor.h
@@ -53,7 +53,7 @@ namespace ACE
 
     protected:
       double value_;
-      
+
     private:
       /// Code common to constructor and clear_impl().
       void init (void);
diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h
index e8b0fc589aa..b61170acc39 100644
--- a/ACE/ace/OS_NS_stdio.h
+++ b/ACE/ace/OS_NS_stdio.h
@@ -123,7 +123,7 @@ inline ACE_HANDLE ace_fileno_helper (FILE *fp)
 # endif /* defined (fileno) */
 }
 #endif /* !ACE_FILENO_EQUIVALENT */
- 
+
 #if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \
     && !defined(ACE_WIN32) && !defined (ACE_VXWORKS)
 /// Helper for the ACE_OS::cuserid() function
diff --git a/ACE/ace/QoS/QoS_Session.h b/ACE/ace/QoS/QoS_Session.h
index 3e08bbc69ce..da426bc8eb3 100644
--- a/ACE/ace/QoS/QoS_Session.h
+++ b/ACE/ace/QoS/QoS_Session.h
@@ -52,7 +52,7 @@ public:
     RSVP_RESV_EVENT,
     RSVP_RESV_CONFIRM,
     RSVP_RESV_ERROR,
-    RSVP_PATH_ERROR    
+    RSVP_PATH_ERROR
   };
 
   /// A flag to indicate if this endpoint is a sender or a receiver or
@@ -64,7 +64,7 @@ public:
     ACE_QOS_BOTH
   };
 
-  
+
   /// to shutup g++.
   virtual ~ACE_QoS_Session (void) {};
 
@@ -118,7 +118,7 @@ public:
 
   virtual void  rsvp_event_type (RSVP_Event_Type event_type) = 0;
   ///Set the RAPI event that last occured
-  
+
   virtual RSVP_Event_Type rsvp_event_type (void) = 0;
   ///Get the RAPI event that last occured
 
@@ -137,10 +137,10 @@ public:
 
   //Set the source host
   virtual ACE_INET_Addr* source_addr (void) const = 0;
-  
+
   /// Set the source port for this session.
   virtual void source_addr (ACE_INET_Addr* source_addr) = 0;
-  
+
 
   /**
    * Returns the version of the underlying RSVP implementation. Is
diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h
index a9ea0287540..14f2f6653db 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.h
+++ b/ACE/ace/QoS/QoS_Session_Impl.h
@@ -115,7 +115,7 @@ public:
 
   //Set the source host
   virtual ACE_INET_Addr* source_addr (void) const;
-  
+
   /// Set the source port for this session.
   virtual void source_addr (ACE_INET_Addr* source_addr);
 
@@ -221,7 +221,7 @@ public:
 
   //Set the source host
   virtual ACE_INET_Addr* source_addr (void) const;
-  
+
   /// Set the source port for this session.
   virtual void source_addr (ACE_INET_Addr* source_addr);
 
diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h
index 1957c023468..29da8944cdc 100644
--- a/ACE/ace/SSL/SSL_Asynch_Stream.h
+++ b/ACE/ace/SSL/SSL_Asynch_Stream.h
@@ -306,13 +306,13 @@ protected:
    *
    * Check 1:
    *
-   * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER 
+   * SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
    * via ACE_SSL_Context::default_verify_mode.  If the peer sends an invalid
    * certificate, the SSL handshake will fail; however, if the peer does not
-   * send a certificate, the SSL handshake will complete successfully which 
+   * send a certificate, the SSL handshake will complete successfully which
    * may not be acceptable.  In this case, you must override this method in a
    * subclass and return false if the call to SSL_get_peer_certificate returns
-   * null.  
+   * null.
    *
    * Check 2:
    *
@@ -322,10 +322,10 @@ protected:
    * by your CA to usurp your session.  For further info on this check, see
    * the post_connection_check method in Example 5-8 of 'Network Security with
    * OpenSSL' by Viega, et. al.
-   * 
+   *
    * Return:
-   * 
-   * false - Terminate the connection.  Outstanding IO complete with ERR_CANCELED.   
+   *
+   * false - Terminate the connection.  Outstanding IO complete with ERR_CANCELED.
    *
    * true  - Proceed with connection.  The default implementation returns true.
    */
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.h b/ACE/ace/SSL/SSL_SOCK_Stream.h
index f7a7da788bd..c3d8da6faed 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.h
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.h
@@ -233,7 +233,7 @@ public:
                   int flags,
                   const ACE_Time_Value *timeout,
                   size_t *bytes_transferred = 0) const;
-                  
+
   /**
    * Try to receive exactly len bytes into buf (uses the recv() call).
    * The ACE_Time_Value indicates how long to blocking trying to
diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h
index 2f5901c5220..b59ab98bba0 100644
--- a/ACE/ace/Stack_Trace.h
+++ b/ACE/ace/Stack_Trace.h
@@ -37,31 +37,31 @@
  *  A new conversion character, the question mark, was added to ACE_Log_Msg for stack
  *  trace logging. The %? conversion character was added as a convenience so that users
  *  need not instantiate an ACE_Stack_Trace instance solely for the  purpose of printing
- *  it in an ACE logging message.  The following are functionally equivalent: 
+ *  it in an ACE logging message.  The following are functionally equivalent:
  *
  *  \code
- *     ACE_DEBUG((LM_DEBUG, "%?")); 
+ *     ACE_DEBUG((LM_DEBUG, "%?"));
  *
  *     ACE_Stack_Trace st;
- *     ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() )); 
+ *     ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() ));
  *  \endcode
  *
  *  These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp.
  *
  *  @note The stack trace functionality was currently supported on platforms:
- *        - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined 
+ *        - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined
  *          (this covers Linux and Mac) and gcc version >= 3.3.
  *        - VxWorks, both kernel and RTP
  *        - Solaris
  *        - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile)
  *
- *  @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not 
- *        get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack 
- *        trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ 
- *        with a larger value that is enough for the stack trace data in your @c config.h file 
+ *  @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not
+ *        get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack
+ *        trace data length. To get a complete stack trace, you need set @c ACE_STACK_TRACE_SYMBUFSIZ
+ *        with a larger value that is enough for the stack trace data in your @c config.h file
  *        and rebuild ACE.
  *
- *  @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation. 
+ *  @note Using ACE logging mechanism (%?) to log the stack trace also has ACE_MAXLOGMSGLEN size limitation.
  *        To get a complete stack trace, you could use different output method. Following is an example.
  *
  *  \code
@@ -75,8 +75,8 @@ public:
   /**
    * @brief Grab a snapshot of the current stack trace and hold it for later use.
    *
-   * @param starting_frame_offset offset into the array of frames to start printing; 0 is the 
-   *  platform-specific offset for the first frame, positive numbers give less frames, negative give 
+   * @param starting_frame_offset offset into the array of frames to start printing; 0 is the
+   *  platform-specific offset for the first frame, positive numbers give less frames, negative give
    *  more frames
    * @param num_frames the number of stack frames to include (0 indicates platform-specific maximum)
    *
diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h
index 70a9f63e3f7..9a235126c08 100644
--- a/ACE/ace/Unbounded_Set.h
+++ b/ACE/ace/Unbounded_Set.h
@@ -50,7 +50,7 @@ public:
 
   // = Initialization method.
   ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end = false);
-  
+
   ACE_Unbounded_Set_Iterator (const base_type &s);
 };
 
@@ -63,13 +63,13 @@ class ACE_Unbounded_Set_Const_Iterator : public
   ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> >
 {
 public:
-  
+
   typedef ACE_Unbounded_Set_Ex_Const_Iterator<T, ACE_Unbounded_Set_Default_Comparator<T> > base_type;
-  
+
   // = Initialization method.
   ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s,
                                     bool end = false);
-  
+
   ACE_Unbounded_Set_Const_Iterator (const base_type &s);
 };
 
diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor/XtReactor.h
index cf578ab55cd..ec6d7cf70e8 100644
--- a/ACE/ace/XtReactor/XtReactor.h
+++ b/ACE/ace/XtReactor/XtReactor.h
@@ -110,7 +110,7 @@ protected:
   /// Synchronize XtInputHandler for @a handle
   virtual void synchronize_XtInput(ACE_HANDLE handle);
 
-  /// Compute needed Xt condition by looking at base class wait set. 
+  /// Compute needed Xt condition by looking at base class wait set.
   virtual int compute_Xt_condition(ACE_HANDLE handle);
 
   /// Wait for events to occur.
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
index 32304399b9c..c1f54c60732 100644
--- a/ACE/ace/config-kfreebsd.h
+++ b/ACE/ace/config-kfreebsd.h
@@ -133,7 +133,7 @@
 
 /* Define to 1 if platform has the <new.h> header file. */
 #ifdef ACE_HAS_NEW_H
-#undef ACE_HAS_NEW_H 
+#undef ACE_HAS_NEW_H
 #endif
 
 #ifndef ACE_LACKS_NEW_H
diff --git a/ACE/ace/config-qnx-rtp.h b/ACE/ace/config-qnx-rtp.h
index 513d6eb1b00..ea4c3902b60 100644
--- a/ACE/ace/config-qnx-rtp.h
+++ b/ACE/ace/config-qnx-rtp.h
@@ -2,8 +2,8 @@
 // $Id$
 // The following configuration file is designed to work for QNX RTP
 // GNU C++ and the POSIX (pthread) threads package. You can get QNX
-// RTP at http://get.qnx.com. 
-// This header is intended to switch between configuration for 
+// RTP at http://get.qnx.com.
+// This header is intended to switch between configuration for
 // various NTO versions.
 #ifndef ACE_CONFIG_QNX_RTP_H
 #define ACE_CONFIG_QNX_RTP_H
diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h
index 217aa655c8c..9a53cf5dd54 100644
--- a/ACE/ace/os_include/os_netdb.h
+++ b/ACE/ace/os_include/os_netdb.h
@@ -40,7 +40,7 @@ extern "C"
 #if !defined (ACE_LACKS_NETDB_H)
 #  include /**/ <netdb.h>
 #endif /* !ACE_LACKS_NETDB_H */
-  
+
 #if defined (ACE_LACKS_HOSTENT)
 struct  hostent {
         char    *h_name;        /* official name of host */
diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
index 589d5710e47..adc03508dff 100644
--- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
+++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h
@@ -70,7 +70,7 @@ class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator
 //   This class enables caching of dynamically allocated,
 //   fixed-sized classes.
 {
-public: 
+public:
 
   JAWS_TSS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS);
 
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index 370088892de..0f6b7c59a34 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -80,7 +80,7 @@ public:
 
 class JAWS_Export JAWS_Datagram
 {
-public: 
+public:
 
   JAWS_Datagram (JAWS_Datagram_Impl *impl = 0);
 
diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h
index d2468344307..e381e3d2a36 100644
--- a/ACE/apps/JAWS3/jaws3/Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Timer.h
@@ -87,7 +87,7 @@ public:
 private:
 
   JAWS_Timer_Impl *impl_;
-  
+
 };
 
 
diff --git a/ACE/apps/soreduce/Obj_Module.h b/ACE/apps/soreduce/Obj_Module.h
index 1836b75e7ec..f03a3c392c0 100644
--- a/ACE/apps/soreduce/Obj_Module.h
+++ b/ACE/apps/soreduce/Obj_Module.h
@@ -9,15 +9,15 @@
 #define _OBJ_MODULE_H_
 
 // Obj_Module encapsulates the result of applying nm to a single object module
-// in a shared library.  Currently an object module consists of two types of 
+// in a shared library.  Currently an object module consists of two types of
 // signatures, those that are exported, able to resolve references from others,
 // and those that are imported, needing resolution.
 //
-// Obj_Modules keep track of external references. In the end, any module that 
+// Obj_Modules keep track of external references. In the end, any module that
 // has one or more external references to it must be included in the resulting
-// library. While the means exists to remove external references, perhaps 
-// through further analysis of undefined signatures and their usage, this is 
-// not currently done. Once a technique is discovered to allow for easy 
+// library. While the means exists to remove external references, perhaps
+// through further analysis of undefined signatures and their usage, this is
+// not currently done. Once a technique is discovered to allow for easy
 // determination that reference is truly unneeded this code may be useful.
 
 #include "Sig_List.h"
@@ -51,12 +51,12 @@ public:
   // not included in the final library.
   int extref ();
 
-  // add a new external reference to this module. 
+  // add a new external reference to this module.
   void add_extref ();
 
   // remove an exterenal reference. Currently, this function is not used.
   void remove_extref();
-  
+
 private:
   void populate_sig_list (Sig_List &, int ,  ACE_Message_Block *);
   int read_line (ACE_HANDLE src, ACE_Message_Block **buf);
diff --git a/ACE/apps/soreduce/SO_Group.h b/ACE/apps/soreduce/SO_Group.h
index 09758c8c7bb..df4723a5905 100644
--- a/ACE/apps/soreduce/SO_Group.h
+++ b/ACE/apps/soreduce/SO_Group.h
@@ -14,7 +14,7 @@
 // analize a collection of applications so that common shared libraries can
 // be reduced.
 
-class SO_Group 
+class SO_Group
 {
 public:
   SO_Group ();
@@ -25,7 +25,7 @@ public:
   // libraries if found. Finally, add the undefined symbols from the executable
   // to the undefs collection.
   void add_executable(const char * );
-  
+
   // Do the actual business of the program
   void analize ();
 
diff --git a/ACE/apps/soreduce/Sig_List.h b/ACE/apps/soreduce/Sig_List.h
index 9b4b0dc115f..bd85974451e 100644
--- a/ACE/apps/soreduce/Sig_List.h
+++ b/ACE/apps/soreduce/Sig_List.h
@@ -9,11 +9,11 @@
 #ifndef _SIG_LIST_H_
 #define _SIG_LIST_H_
 
-// A Sig_List is a specialized container of signatures. The initial use of a 
-// Sig_List was to manage a variable length of undefined Signatures, so the 
-// program could know when all possible resolutions were determined. As the 
-// program grows in complexity, Sig_Lists are used to store other groups as 
-// well.  The methods provide simple list traversal, as well as efficient use 
+// A Sig_List is a specialized container of signatures. The initial use of a
+// Sig_List was to manage a variable length of undefined Signatures, so the
+// program could know when all possible resolutions were determined. As the
+// program grows in complexity, Sig_Lists are used to store other groups as
+// well.  The methods provide simple list traversal, as well as efficient use
 // of space.
 
 #include "Signature.h"
diff --git a/ACE/apps/soreduce/Signature.h b/ACE/apps/soreduce/Signature.h
index 358a756aa7a..189a430543a 100644
--- a/ACE/apps/soreduce/Signature.h
+++ b/ACE/apps/soreduce/Signature.h
@@ -9,15 +9,15 @@
 #ifndef _SIGNATURE_H_
 #define _SIGNATURE_H_
 
-// Signature class encapsulates a single line of nm output. This line may be 
-// either an "undefined" name to be resolved, or text or data which resolves 
-// the unknowns. Some of the features of the Signature class are currently 
-// unused, such as owner_, which is anticipation of analysis that may lead to 
-// further code reduction. The premise being that unresolved symbols that are 
-// defined within otherwise unused code should not be resolved. However this 
-// information is not available in the output of nm. Further research is 
+// Signature class encapsulates a single line of nm output. This line may be
+// either an "undefined" name to be resolved, or text or data which resolves
+// the unknowns. Some of the features of the Signature class are currently
+// unused, such as owner_, which is anticipation of analysis that may lead to
+// further code reduction. The premise being that unresolved symbols that are
+// defined within otherwise unused code should not be resolved. However this
+// information is not available in the output of nm. Further research is
 // required.
-// 
+//
 // Signatures are reference counted to avoid duplication.
 
 #include <ace/SString.h>
@@ -27,7 +27,7 @@ public:
 
   enum Kind {
     text_,
-    undef_ 
+    undef_
   };
 
   Signature (const ACE_CString &);
@@ -43,7 +43,7 @@ private:
   ACE_CString name_;
   int ref_count_;
   int used_;
-  Signature * owner_; 
+  Signature * owner_;
   Kind kind_;
 };
 
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index f55a677965c..099a41c831a 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -1032,38 +1032,6 @@ sub check_for_streams_include ()
     }
 }
 
-# This test checks for the inclusion of OS.h.
-sub check_for_OS_h_include ()
-{
-    print "Running ace/OS.h test\n";
-    foreach $file (@files_h, @files_cpp, @files_inl) {
-        if (open (FILE, $file)) {
-            my $disable = 0;
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                if (/FUZZ\: disable check_for_OS_h_include/) {
-                    $disable = 1;
-                }
-                if (/FUZZ\: enable check_for_OS_h_include/) {
-                    $disable = 0;
-                }
-                if ($disable == 0 and ($file =~ /.*CIAO.*/)
-                    and /^\s*#\s*include\s*\"ace\/OS\.h\"/) {
-                    print_error ("$file:$.: expensive ace/OS.h included; consider an OS_NS_*.h file");
-                    print " OS.h is very expensive in both ";
-                    print "compile-time and footprint. \n";
-                    print " Please consider including one of the ";
-                    print "OS_NS_*.h files instead.\n\n";
-                }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
 # This test checks for the inclusion of Synch*.h.
 sub check_for_synch_include ()
 {
@@ -2105,7 +2073,6 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
     print "\t   check_for_noncvs_files
            check_for_generated_headers
            check_for_synch_include
-           check_for_OS_h_include
            check_for_streams_include
            check_for_dependency_file
            check_for_makefile_variable
@@ -2194,7 +2161,6 @@ check_for_NULL () if ($opt_l >= 1);
 check_for_inline () if ($opt_l >= 2);
 check_for_math_include () if ($opt_l >= 3);
 check_for_synch_include () if ($opt_l >= 6);
-check_for_OS_h_include () if ($opt_l >= 5);
 check_for_line_length () if ($opt_l >= 8);
 check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
diff --git a/ACE/contrib/FaCE/newres.h b/ACE/contrib/FaCE/newres.h
index 3808b7b22a1..2847d54813d 100644
--- a/ACE/contrib/FaCE/newres.h
+++ b/ACE/contrib/FaCE/newres.h
@@ -31,7 +31,7 @@
 #ifndef _INC_WINDOWS
 #define _INC_WINDOWS
     #include "winuser.h"           // extract from windows header
-    #include "winver.h"   
+    #include "winver.h"
     #include "windows.h"
 #endif
 #endif
diff --git a/ACE/contrib/FaCE/resource.h b/ACE/contrib/FaCE/resource.h
index a79d8345d1b..6faefc19e50 100644
--- a/ACE/contrib/FaCE/resource.h
+++ b/ACE/contrib/FaCE/resource.h
@@ -34,7 +34,7 @@
 #define ID_TOOLS_SAVETOFILE             40012
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        116
diff --git a/ACE/examples/APG/Threads/Message_Receiver.h b/ACE/examples/APG/Threads/Message_Receiver.h
index dee0731f007..e92afe4b474 100644
--- a/ACE/examples/APG/Threads/Message_Receiver.h
+++ b/ACE/examples/APG/Threads/Message_Receiver.h
@@ -29,7 +29,7 @@ public:
   HA_Device_Repository ();
 
   int update_device (int device_id, char *commands);
-    
+
 private:
   ACE_Task_Base *owner_;
 };
@@ -63,12 +63,12 @@ public:
   {
     ACE_ASSERT(0);
   }
-  
+
   Message_Receiver (HA_CommandHandler *ch) : handler_(ch)
   { }
 
   ACE_Message_Block *shut_down_message (void);
-    
+
   virtual int handle_input (ACE_HANDLE fd);
 
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
@@ -78,7 +78,7 @@ public:
     delete this;
     return 0;
   }
-    
+
 private:
   int read_header (DeviceCommandHeader *dch);
   int copy_payload (ACE_Message_Block *mb, int payload_length);
diff --git a/ACE/examples/APG/Timers/PCB.h b/ACE/examples/APG/Timers/PCB.h
index 7fdb9d2d1cf..4bd223b3c68 100644
--- a/ACE/examples/APG/Timers/PCB.h
+++ b/ACE/examples/APG/Timers/PCB.h
@@ -19,7 +19,7 @@ public:
   virtual int handleEvent (const void *arg);
   virtual int handleCancel (void);
   virtual int handleClose (void);
- 
+
 private:
   long timerID_;
   int count_;
diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.h b/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.h
index d6639cf78d2..647f0e4ebc7 100644
--- a/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.h
+++ b/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.h
@@ -28,7 +28,7 @@ public:
   // 3600 seconds == one hour.
   enum { MAX_CLIENT_TIMEOUT = 3600 };
 
-  Logging_Event_Handler_Ex 
+  Logging_Event_Handler_Ex
     (ACE_Reactor *reactor,
      const ACE_Time_Value &max_client_timeout
        = ACE_Time_Value (MAX_CLIENT_TIMEOUT))
@@ -48,7 +48,7 @@ public:
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *act);
 
-  // Called when this object is destroyed, e.g., when it's 
+  // Called when this object is destroyed, e.g., when it's
   // removed from a reactor.
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = 0);
diff --git a/ACE/examples/C++NPv2/Service_Reporter.h b/ACE/examples/C++NPv2/Service_Reporter.h
index c6de7484767..2ebdabf0864 100644
--- a/ACE/examples/C++NPv2/Service_Reporter.h
+++ b/ACE/examples/C++NPv2/Service_Reporter.h
@@ -27,7 +27,7 @@ protected:
 
   // Reactor hook methods.
   virtual int handle_input (ACE_HANDLE);
-  virtual ACE_HANDLE get_handle () const 
+  virtual ACE_HANDLE get_handle () const
   { return acceptor_.get_handle (); }
 
 private:
diff --git a/ACE/examples/ConfigViewer/ConfigTreeCtrl.h b/ACE/examples/ConfigViewer/ConfigTreeCtrl.h
index e44eb837384..9a5674ab499 100644
--- a/ACE/examples/ConfigViewer/ConfigTreeCtrl.h
+++ b/ACE/examples/ConfigViewer/ConfigTreeCtrl.h
@@ -43,7 +43,7 @@ protected:
   void ResolveKey(wxTreeItemId Item, ACE_Configuration_Section_Key& Key);
 private:
   DECLARE_EVENT_TABLE()
-  
+
   ACE_Configuration*    m_pConfig;
   ValueListCtrl*        m_pListCtrl;
 };
diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.h b/ACE/examples/ConfigViewer/ValueListCtrl.h
index ce802e67e96..a4c95551d20 100644
--- a/ACE/examples/ConfigViewer/ValueListCtrl.h
+++ b/ACE/examples/ConfigViewer/ValueListCtrl.h
@@ -10,9 +10,9 @@ public:
   ///////////////////////////////////////////
   // Initializers
   ///////////////////////////////////////////
-  ValueListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, 
-        const wxSize& size = wxDefaultSize, long style = wxLC_ICON, 
-        const wxValidator& validator = wxDefaultValidator, 
+  ValueListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxLC_ICON,
+        const wxValidator& validator = wxDefaultValidator,
         const wxString& name = "listCtrl");
   virtual ~ValueListCtrl();
 
diff --git a/ACE/examples/DLL/Magazine.h b/ACE/examples/DLL/Magazine.h
index 6555974494f..aa95017beb2 100644
--- a/ACE/examples/DLL/Magazine.h
+++ b/ACE/examples/DLL/Magazine.h
@@ -11,7 +11,7 @@
 //    Magazine.h
 //
 // = DESCRIPTION
-//    Abstract class whose methods are implemented by the derived 
+//    Abstract class whose methods are implemented by the derived
 //    classes.
 //
 // = AUTHOR
@@ -22,19 +22,19 @@
 #ifndef MAGAZINE_H
 #define MAGAZINE_H
 
-class Magazine 
+class Magazine
 {
-  // = TITLE 
+  // = TITLE
   //   This is an abstract class used in the DLL example.
   //
-  // = DESCRIPTION 
-  //   This class simply is an inetrface which the derived classes 
+  // = DESCRIPTION
+  //   This class simply is an inetrface which the derived classes
   //   will exploit.
 public:
 
   virtual ~Magazine (void) {};
   // No-op virtual destructor.
-  
+
   virtual void title (void) = 0;
   // This method gives the title of the magazine.
 };
diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Resource.h b/ACE/examples/Log_Msg/Log_Msg_MFC/Resource.h
index d1aa3df6ce1..2a0122f05f7 100644
--- a/ACE/examples/Log_Msg/Log_Msg_MFC/Resource.h
+++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Resource.h
@@ -10,7 +10,7 @@
 #define IDC_BUTTON1                     1000
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        129
diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h
index 35b9f3a19e7..b2d4a0f40fa 100644
--- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h
+++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.h
@@ -27,18 +27,18 @@ class QoS_Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release QoS sessions.
 
 public:
-  
+
   QoS_Signal_Handler (ACE_QoS_Session *qos_session);
   // constructor.
-  
+
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
   // Override this method to implement graceful shutdown.
-  
+
 private:
-  
+
   ACE_QoS_Session *qos_session_;
   // Session to be gracefully shutdown.
- 
+
 };
 
 #endif /* QOS_SIGNAL_HANDLER_H */
diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h
index 35b9f3a19e7..b2d4a0f40fa 100644
--- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h
+++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Signal_Handler.h
@@ -27,18 +27,18 @@ class QoS_Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release QoS sessions.
 
 public:
-  
+
   QoS_Signal_Handler (ACE_QoS_Session *qos_session);
   // constructor.
-  
+
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
   // Override this method to implement graceful shutdown.
-  
+
 private:
-  
+
   ACE_QoS_Session *qos_session_;
   // Session to be gracefully shutdown.
- 
+
 };
 
 #endif /* QOS_SIGNAL_HANDLER_H */
diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.h b/ACE/examples/QOS/Simple/QoS_Signal_Handler.h
index 35b9f3a19e7..b2d4a0f40fa 100644
--- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.h
+++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.h
@@ -27,18 +27,18 @@ class QoS_Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release QoS sessions.
 
 public:
-  
+
   QoS_Signal_Handler (ACE_QoS_Session *qos_session);
   // constructor.
-  
+
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
   // Override this method to implement graceful shutdown.
-  
+
 private:
-  
+
   ACE_QoS_Session *qos_session_;
   // Session to be gracefully shutdown.
- 
+
 };
 
 #endif /* QOS_SIGNAL_HANDLER_H */
diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
index bcacb84f0c9..964c0705d49 100644
--- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
+++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h
@@ -25,7 +25,7 @@ class Gadget_Part_Impl : public Gadget_Part
 public:
   /// Constructor.
   Gadget_Part_Impl (Gadget_ptr owner, const char* name, int size);
-  
+
   /// Destructor.
   virtual ~Gadget_Part_Impl (void);
 
@@ -37,7 +37,7 @@ public:
 
 private:
   /// The gadget that contains this part.
-  ///  
+  ///
   /// Some things to note about the choice of ACE_Weak_Bound_Ptr (from the
   /// typedef for Gadget_ptr):
   /// - We cannot use an ACE_Strong_Bound_Ptr (Gadget_var) since that would
diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
index dbb1d4c714c..f63cbabf402 100644
--- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
+++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h
@@ -25,7 +25,7 @@ class Widget_Part_Impl : public Widget_Part
 public:
   /// Constructor.
   Widget_Part_Impl (Widget *owner, const char* name, int size);
-  
+
   /// Destructor.
   virtual ~Widget_Part_Impl (void);
 
diff --git a/ACE/examples/Web_Crawler/Command_Processor.h b/ACE/examples/Web_Crawler/Command_Processor.h
index 93c36ae4524..b778380fa22 100644
--- a/ACE/examples/Web_Crawler/Command_Processor.h
+++ b/ACE/examples/Web_Crawler/Command_Processor.h
@@ -53,7 +53,7 @@ class URL_Command : public Command
 public:
   URL_Command (URL *);
   // Constructor.
-  
+
   virtual int execute (void);
   // Execute the URL command.
 
diff --git a/ACE/examples/Web_Crawler/HTTP_URL.h b/ACE/examples/Web_Crawler/HTTP_URL.h
index a926bb47938..17e81863805 100644
--- a/ACE/examples/Web_Crawler/HTTP_URL.h
+++ b/ACE/examples/Web_Crawler/HTTP_URL.h
@@ -29,7 +29,7 @@ class HTTP_URL : public URL
 {
   // = TITLE
   //    An ADT for an HTTP URL.
-  // 
+  //
   // = DESCRIPTION
   //    This class plays the "element" role in the Visitor pattern.
 public:
@@ -47,7 +47,7 @@ public:
   virtual ssize_t send_request (void);
   // Send a <GET> command to fetch the contents in the URI from the
   // server.
-  
+
   virtual const ACE_URL_Addr &url_addr (void) const;
   // Returns the URL that we represent.
 
diff --git a/ACE/examples/Web_Crawler/Iterators.h b/ACE/examples/Web_Crawler/Iterators.h
index b5d267f7afb..5f174281fa0 100644
--- a/ACE/examples/Web_Crawler/Iterators.h
+++ b/ACE/examples/Web_Crawler/Iterators.h
@@ -27,7 +27,7 @@ class URL_Iterator
 {
   // = TITLE
   //    An abstract base class that defines an iterator.
-  // 
+  //
   // = DESCRIPTION
   //    Subclasses of this base class can define what strings
   //    to return from <next>.  This class decouples higher-level
@@ -97,7 +97,7 @@ class URL_Download_Iterator : public URL_Iterator
   // = TITLE
   //    An iterator that iterates over the contents of an entire URL,
   //    i.e., both header and body, and returns it in <BUFSIZ>
-  //    <buffer>s. 
+  //    <buffer>s.
 public:
   // = Initialization and termination methods.
   URL_Download_Iterator (URL &url);
diff --git a/ACE/examples/Web_Crawler/Options.h b/ACE/examples/Web_Crawler/Options.h
index ef5f2efd40c..0c9768822f5 100644
--- a/ACE/examples/Web_Crawler/Options.h
+++ b/ACE/examples/Web_Crawler/Options.h
@@ -35,7 +35,7 @@ class Options
   //   Maintains the global options.
   //
   // = DESCRIPTION
-  //   This class is converted into a Singleton by the 
+  //   This class is converted into a Singleton by the
   //   <ACE_Singleton> template.
 public:
   int parse_args (int argc, ACE_TCHAR *argv[]);
@@ -80,7 +80,7 @@ public:
 
   // Get the handle_limit.
   int handle_limit (void);
-private:  
+private:
   int recurse_;
   // Are we recursving.
 
@@ -113,12 +113,12 @@ private:
 
   int port_no_;
   // Port no.
-  
+
   int handle_limit_;
   // The limit of the number of descriptors to be given for this process.
 };
 
-// Typedef an Options Singleton. 
+// Typedef an Options Singleton.
 typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
 
 #endif /* _OPTIONS_H */
diff --git a/ACE/examples/Web_Crawler/URL_Status.h b/ACE/examples/Web_Crawler/URL_Status.h
index 672c5e4f240..9996fbf7e3d 100644
--- a/ACE/examples/Web_Crawler/URL_Status.h
+++ b/ACE/examples/Web_Crawler/URL_Status.h
@@ -55,7 +55,7 @@ public:
   void status (STATUS_CODE);
   int destroy (void);
 private:
-  STATUS_CODE status_;  
+  STATUS_CODE status_;
 };
 
 #endif /* _URL_STATUS_H */
diff --git a/ACE/tests/randomize.h b/ACE/tests/randomize.h
index 5a6b5ff3fcb..6f6f550093c 100644
--- a/ACE/tests/randomize.h
+++ b/ACE/tests/randomize.h
@@ -78,7 +78,7 @@ namespace
     // The array.
     T * const array_;
 
-    // Factor out the constant coefficient.  
+    // Factor out the constant coefficient.
     double const coefficient_;
 
     // Random number generator seed value.
diff --git a/ACE/websvcs/lib/URL_Addr.h b/ACE/websvcs/lib/URL_Addr.h
index 07e9b34c167..4e09a79ba76 100644
--- a/ACE/websvcs/lib/URL_Addr.h
+++ b/ACE/websvcs/lib/URL_Addr.h
@@ -74,7 +74,7 @@ public:
   static ACE_URL_Addr* create_address (const ACE_TCHAR *url);
   // Create an address from a complete URL, such as "http://www/foo"
   // or "ftp://ftp.here/get_this".
-  
+
   static int known_scheme (const ACE_TCHAR *url);
   // Returns 1 if the URL scheme is recognized, 0 otherwise.
 
@@ -129,7 +129,7 @@ public:
   // The visit methods for all the hierarchy.
   // The default implementation is a nop (instead of a pure virtual
   // function) to facilitate the addition of new members in the
-  // hierarchy. 
+  // hierarchy.
   // virtual int visit (ACE_AFS_Addr*);
   // virtual int visit (ACE_News_Addr*);
   // virtual int visit (ACE_NNTP_Addr*);
@@ -174,7 +174,7 @@ public:
 
   ACE_HTTP_Addr& operator= (const ACE_HTTP_Addr &addr);
   // Assignment operator.
- 
+
   int set (const ACE_HTTP_Addr &addr);
   // Essentially the copy constructor.
 
@@ -203,7 +203,7 @@ public:
   // Create an address from a (possibly) relative URL, such as
   // "../foo.html", or "/icons/bar.gif"
   // If the URL is absolute (like "http://www/foo" or "ftp:host/bar")
-  // it simply returns the correct ACE_URL_Addr object; but if the URL 
+  // it simply returns the correct ACE_URL_Addr object; but if the URL
   // is not absolute then it is interpreted as relative from the
   // current address.  In that case url is just a path, if it is a
   // relative path the new address simply concatenates the path and