Corrected erroneous comments.

14 files changed, 181 insertions, 183 deletions

diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
index c344cc401c6..f0778ecfaf4 100644
--- a/ace/CORBA_Ref.h
+++ b/ace/CORBA_Ref.h
@@ -6,9 +6,9 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    CORBA_Ref
+//    CORBA_Ref.h
 //
 // = AUTHOR
 //    Irfan Pyarali (irfan@wuerl.wustl.edu).
diff --git a/ace/Dynamic.h b/ace/Dynamic.h
index 8411dc9ad25..b105a4b6955 100644
--- a/ace/Dynamic.h
+++ b/ace/Dynamic.h
@@ -6,17 +6,17 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    ACE_Dynamic.h 
+//    Dynamic.h
 //
 // = AUTHOR
 //    Doug Schmidt and Irfan Pyrarli.
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_DYNAMIC_H)
-#define ACE_DYNAMIC_H 
+#define ACE_DYNAMIC_H
 
 #include "ace/ACE.h"
 
@@ -54,4 +54,3 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #endif /* ACE_DYNAMIC_H */
-
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 186b6f6ede3..fccd5f8bd5d 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -5,15 +5,15 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Local_Name_Space_T.h
+//    Local_Name_Space_T.h
 //
 // = AUTHOR
 //    Prashant Jain (pjain@cs.wustl.edu), Irfan Pyarali
 //    (irfan@wuerl.wustl.edu), and Douglas C. Schmidt
-//    (schmidt@cs.wustl.edu). 
-// 
+//    (schmidt@cs.wustl.edu).
+//
 // ============================================================================
 
 #if !defined (ACE_LOCAL_NAME_SPACE_T_H)
@@ -64,26 +64,26 @@ public:
   // provided by <ACE_Hash_Map_Manager>.  When they are called, they
   // acquire the lock, set the allocator to the one specific to this
   // process, and then call down to perform the intended operation.
-  int bind (const ACE_NS_String &, 
+  int bind (const ACE_NS_String &,
 	    const ACE_NS_Internal &,
 	    ALLOCATOR *alloc);
 
-  int unbind (const ACE_NS_String &, 
+  int unbind (const ACE_NS_String &,
 	      ACE_NS_Internal &,
 	      ALLOCATOR *alloc);
 
-  int rebind (const ACE_NS_String &, 
+  int rebind (const ACE_NS_String &,
 	      const ACE_NS_Internal &,
-	      ACE_NS_String &, 
+	      ACE_NS_String &,
 	      ACE_NS_Internal &,
 	      ALLOCATOR *alloc);
 
-  int find (const ACE_NS_String &, 
+  int find (const ACE_NS_String &,
 	    ACE_NS_Internal &,
 	    ALLOCATOR *alloc);
 
   int close (ALLOCATOR *alloc);
-  
+
 private:
 };
 
@@ -98,7 +98,7 @@ class ACE_Local_Name_Space : public ACE_Name_Space
   //     Manages a Naming Service for a local name space which includes
   //	 bindings for node_local and host_local naming contexts.
   //	 All strings are stored in wide character format.
-  //     A Name Binding consists of a name (that's the key), a value 
+  //     A Name Binding consists of a name (that's the key), a value
   //	 string and an optional type string (no wide chars).
 {
 public:
@@ -125,68 +125,68 @@ public:
 		    const ACE_WString &value,
 		    const char *type = "");
   // Bind a new name to a naming context (Wide character strings).
-  
-  virtual int rebind (const ACE_WString &name, 
+
+  virtual int rebind (const ACE_WString &name,
 		      const ACE_WString &value,
 		      const char *type = "");
   // Overwrite the value or type of an existing name in a
   // ACE_Local_Name_Space or bind a new name to the context, if it
   // didn't exist yet. (Wide charcter strings interface).
-  
+
   virtual int unbind (const ACE_WString &name);
   virtual int unbind_i (const ACE_WString &name);
   // Delete a name from a ACE_Local_Name_Space (Wide charcter strings
   // Interface).
-  
-  virtual int resolve (const ACE_WString &name, 
-		       ACE_WString &value, 
+
+  virtual int resolve (const ACE_WString &name,
+		       ACE_WString &value,
 		       char *&type);
-  virtual int resolve_i (const ACE_WString &name, 
-			 ACE_WString &value, 
+  virtual int resolve_i (const ACE_WString &name,
+			 ACE_WString &value,
 			 char *&type);
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting <type>!
-  
-  virtual int list_names (ACE_WSTRING_SET &set, 
+
+  virtual int list_names (ACE_WSTRING_SET &set,
 			  const ACE_WString &pattern);
-  virtual int list_names_i (ACE_WSTRING_SET &set, 
+  virtual int list_names_i (ACE_WSTRING_SET &set,
 			  const ACE_WString &pattern);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
-  virtual int list_values (ACE_WSTRING_SET &set, 
+  virtual int list_values (ACE_WSTRING_SET &set,
 			   const ACE_WString &pattern);
-  virtual int list_values_i (ACE_WSTRING_SET &set, 
+  virtual int list_values_i (ACE_WSTRING_SET &set,
 			     const ACE_WString &pattern);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
-  virtual int list_types (ACE_WSTRING_SET &set, 
+  virtual int list_types (ACE_WSTRING_SET &set,
 			  const ACE_WString &pattern);
-  virtual int list_types_i (ACE_WSTRING_SET &set, 
+  virtual int list_types_i (ACE_WSTRING_SET &set,
 			    const ACE_WString &pattern);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
-  virtual int list_name_entries (ACE_BINDING_SET &set, 
+  virtual int list_name_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern);
-  virtual int list_name_entries_i (ACE_BINDING_SET &set, 
+  virtual int list_name_entries_i (ACE_BINDING_SET &set,
 				   const ACE_WString &pattern);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_value_entries (ACE_BINDING_SET &set, 
+  virtual int list_value_entries (ACE_BINDING_SET &set,
 				  const ACE_WString &pattern);
-  virtual int list_value_entries_i (ACE_BINDING_SET &set, 
+  virtual int list_value_entries_i (ACE_BINDING_SET &set,
 				    const ACE_WString &pattern);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_type_entries (ACE_BINDING_SET &set, 
+  virtual int list_type_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern);
-  virtual int list_type_entries_i (ACE_BINDING_SET &set, 
+  virtual int list_type_entries_i (ACE_BINDING_SET &set,
 				   const ACE_WString &pattern);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 53bc1680981..ff9e7435738 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -7,7 +7,7 @@
 //    ace
 //
 // = FILENAME
-//    Local_Tokens
+//    Local_Tokens.h
 //
 // = AUTHOR
 //    Karl-Heinz Dorn (kdorn@erlh.siemens.de)
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index f99fff09d9d..d41d456e4ef 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -8,7 +8,7 @@
 //    ACE
 //
 // = FILENAME
-//    ACE_Name_Proxy.h
+//    Name_Proxy.h
 //
 // = DESCRIPTION
 //    Proxy for dealing with remote server process managing NET_LOCAL
@@ -39,7 +39,7 @@ class ACE_Export ACE_Name_Proxy : public ACE_Event_Handler
 public:
   ACE_Name_Proxy (void);
   // Default constructor.
- 
+
   // = Establish a binding with the ACE_Name Server.
   ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, // Address of ACE_Name Server.
 		  ACE_Synch_Options& options =
@@ -51,16 +51,16 @@ public:
 
   int request_reply (ACE_Name_Request &request);
   // Perform the request and wait for the reply.
- 
+
   int send_request (ACE_Name_Request &request);
   // Perform the request.
- 
+
   int recv_reply (ACE_Name_Request &reply);
   // Receive the reply.
- 
+
   virtual ACE_HANDLE get_handle (void) const;
   // Obtain underlying handle.
- 
+
   virtual ~ACE_Name_Proxy (void);
   // Close down the connection to the server.
 
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index e54c4791c41..7ff3f066b89 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -6,17 +6,17 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Name_Request_Reply.h
+//    Name_Request_Reply.h
 //
-// = DESCRIPTION 
-//     Define the format used to exchange messages between the 
+// = DESCRIPTION
+//     Define the format used to exchange messages between the
 //     ACE_Name Server and its clients.
 //
 // = AUTHOR
 //    Gerhard Lenzer, Douglas C. Schmidt, and Prashant Jain
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_NAME_REQUEST_REPLY_H)
@@ -30,24 +30,24 @@ class ACE_Export ACE_Name_Request
   //   Message format for delivering requests to the ACE_Name Server.
   //
   // = DESCRIPTION
-  //   This class is implemented to minimize data copying.  
+  //   This class is implemented to minimize data copying.
   //   In particular, all marshaling is done in situ...
 {
 public:
   enum Constants
   {
     /* Request message types. */
-    BIND = 01, 
-    REBIND = 02, 
-    RESOLVE = 03, 
-    UNBIND  = 04, 
+    BIND = 01,
+    REBIND = 02,
+    RESOLVE = 03,
+    UNBIND  = 04,
     LIST_NAMES = 05,
     LIST_VALUES = 015,
     LIST_TYPES = 025,
     LIST_NAME_ENTRIES = 06,
     LIST_VALUE_ENTRIES = 016,
     LIST_TYPE_ENTRIES = 026,
-    MAX_ENUM = 11, 
+    MAX_ENUM = 11,
     MAX_LIST = 3,
 
     // Mask for bitwise operation used for table lookup
@@ -69,7 +69,7 @@ public:
 		    const char type[],
 		    const size_t type_length,
 		    ACE_Time_Value *timeout = 0); // Max time willing to wait for request.
-  // Create a <ACE_Name_Request> message.  
+  // Create a <ACE_Name_Request> message.
 
   void init (void);
   // Initialize length_ in order to ensure correct byte ordering
@@ -91,7 +91,7 @@ public:
   ACE_Time_Value timeout (void) const;
   void timeout (const ACE_Time_Value timeout);
 
-  // = Set/get the name 
+  // = Set/get the name
   const ACE_USHORT16 *name (void) const;
   void name (const ACE_USHORT16 *);
 
@@ -125,7 +125,7 @@ public:
   // Print out the values of the message for debugging purposes.
 
 private:
-  // = The 5 fields in the <Transfer> struct are transmitted to the server.  
+  // = The 5 fields in the <Transfer> struct are transmitted to the server.
   // The remaining 2 fields are not tranferred -- they are used only on
   // the server-side to simplify lookups.
 
@@ -138,7 +138,7 @@ private:
     // Type of the request (i.e., <BIND>, <REBIND>, <RESOLVE>, and <UNBIND>).
 
     ACE_UINT32 block_forever_;
-    // Indicates if we should block forever.  If 0, then <secTimeout_> 
+    // Indicates if we should block forever.  If 0, then <secTimeout_>
     // and <usecTimeout_> indicates how long we should wait.
 
     ACE_UINT32 sec_timeout_;
@@ -180,7 +180,7 @@ class ACE_Export ACE_Name_Reply
   //     Message format for delivering replies from the ACE_Name Server.
   //
   // = DESCRIPTION
-  //   This class is implemented to minimize data copying.  
+  //   This class is implemented to minimize data copying.
   //   In particular, all marshaling is done in situ...
 {
 public:
@@ -198,7 +198,7 @@ public:
   // Default constructor.
 
   ACE_Name_Reply (ACE_UINT32 type, ACE_UINT32 err); // Type of reply.
-  // Create a <ACE_Name_Reply> message.  
+  // Create a <ACE_Name_Reply> message.
 
   void init (void);
   // Initialize length_ in order to ensure correct byte ordering
diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index 0aecbad5248..2328b4d3c41 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -7,13 +7,13 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Name_Space
+//    Name_Space.h
 //
 // = AUTHOR
 //    Prashant Jain
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_NAME_SPACE_H)
@@ -35,7 +35,7 @@ public:
 		    const char *t);
   // Main constructor that initializes all the fields.
 
-  ACE_Name_Binding (void); 
+  ACE_Name_Binding (void);
   // Default constructor.
 
   ACE_Name_Binding (const ACE_Name_Binding &);
@@ -52,7 +52,7 @@ public:
 
   ACE_WString name_;
   // Name of the binding.
-  
+
   ACE_WString value_;
   // Value of the binding.
 
@@ -79,16 +79,16 @@ public:
 
   virtual ~ACE_Name_Space (void);
   // virtual destructor to ensure destructors of subclasses get
-  // called.  
-  
-  virtual int bind (const ACE_WString &name_in, 
-		    const ACE_WString &value_in, 
+  // called.
+
+  virtual int bind (const ACE_WString &name_in,
+		    const ACE_WString &value_in,
 		    const char *type_in = "") = 0;
   // Bind a new name to a naming context (Wide character strings).
 
 
-  virtual int rebind (const ACE_WString &name_in, 
-		      const ACE_WString &value_in, 
+  virtual int rebind (const ACE_WString &name_in,
+		      const ACE_WString &value_in,
 		      const char *type_in = "") = 0;
   // Overwrite the value or type of an existing name in a
   // ACE_Name_Space or bind a new name to the context, if it didn't
@@ -98,40 +98,40 @@ public:
   // Delete a name from a ACE_Name_Space (Wide charcter strings
   // Interface).
 
-  virtual int resolve (const ACE_WString &name_in, 
-		       ACE_WString &value_out, 
+  virtual int resolve (const ACE_WString &name_in,
+		       ACE_WString &value_out,
 		       char *&type_out) = 0;
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting both <value_out> and <type_out>!
-  
-  virtual int list_names (ACE_WSTRING_SET &set_out, 
+
+  virtual int list_names (ACE_WSTRING_SET &set_out,
 			  const ACE_WString &pattern_in) = 0;
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
-  virtual int list_values (ACE_WSTRING_SET &set_out, 
+  virtual int list_values (ACE_WSTRING_SET &set_out,
 			   const ACE_WString &pattern_in) = 0;
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
-  virtual int list_types (ACE_WSTRING_SET &set_out, 
+  virtual int list_types (ACE_WSTRING_SET &set_out,
 			  const ACE_WString &pattern_in) = 0;
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
-  virtual int list_name_entries (ACE_BINDING_SET &set, 
+  virtual int list_name_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern) = 0;
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_value_entries (ACE_BINDING_SET &set, 
+  virtual int list_value_entries (ACE_BINDING_SET &set,
 				  const ACE_WString &pattern) = 0;
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_type_entries (ACE_BINDING_SET &set, 
+  virtual int list_type_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern) = 0;
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
@@ -142,4 +142,3 @@ public:
 };
 
 #endif /* ACE_NAME_SPACE_H */
-
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index 2c1525b2788..eb465e684a7 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -7,13 +7,13 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Naming_Context.h
+//    Naming_Context.h
 //
 // = AUTHOR
 //    Gerhard Lenzer, Douglas C. Schmidt, and Prashant Jain
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_NAMING_CONTEXT_H)
@@ -101,25 +101,25 @@ public:
   ACE_Name_Options *name_options (void);
   // Returns the ACE_Name_Options associated with the Naming_Context
 
-  int bind (const ACE_WString &name_in, 
-	    const ACE_WString &value_in, 
+  int bind (const ACE_WString &name_in,
+	    const ACE_WString &value_in,
 	    const char *type_in = "");
   // Bind a new name to a naming context (Wide character strings).
 
-  int bind (const char *name_in, 
-	    const char *value_in, 
+  int bind (const char *name_in,
+	    const char *value_in,
 	    const char *type_in = "");
   // Bind a new name to a naming context ( character strings).
 
-  int rebind (const ACE_WString &name_in, 
-	      const ACE_WString &value_in, 
+  int rebind (const ACE_WString &name_in,
+	      const ACE_WString &value_in,
 	      const char *type_in = "");
   // Overwrite the value or type of an existing name in a
   // ACE_Naming_Context or bind a new name to the context, if it
   // didn't exist yet. (Wide charcter strings interface).
 
-  int rebind (const char *name_in, 
-	      const char *value_in, 
+  int rebind (const char *name_in,
+	      const char *value_in,
 	      const char *type_in = "");
   // Overwrite the value or type of an existing name in a
   // ACE_Naming_Context or bind a new name to the context, if it
@@ -133,86 +133,86 @@ public:
   // Delete a name from a ACE_Naming_Context (character strings
   // interface).
 
-  int resolve (const ACE_WString &name_in, 
-	       ACE_WString &value_out, 
+  int resolve (const ACE_WString &name_in,
+	       ACE_WString &value_out,
 	       char *&type_out);
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting both <value_out> and <type_out>!
 
-  int resolve (const char *name_in, 
-	       ACE_WString &value_out, 
+  int resolve (const char *name_in,
+	       ACE_WString &value_out,
 	       char *&type_out);
   // Get value and type of a given name binding (Wide chars output).
   // The caller is responsible for deleting both <value_out> and
   // <type_out>!
 
-  int resolve (const char *name_in, 
-	       char *&value_out, 
+  int resolve (const char *name_in,
+	       char *&value_out,
 	       char *&type_out);
   // Get value and type of a given name binding ( chars ).  The caller
   // is responsible for deleting both <value_out> and <type_out>!
 
-  int list_names (ACE_PWSTRING_SET &set_out, 
+  int list_names (ACE_PWSTRING_SET &set_out,
 		  const ACE_WString &pattern_in);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
-  int list_names (ACE_PWSTRING_SET &set_out, 
+  int list_names (ACE_PWSTRING_SET &set_out,
 		  const char *pattern_in);
   // Get a set of names matching a specified pattern (chars). Matching
   // means the names must begin with the pattern string.
 
-  int list_values (ACE_PWSTRING_SET &set_out, 
+  int list_values (ACE_PWSTRING_SET &set_out,
 		   const ACE_WString &pattern_in);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
-  int list_values (ACE_PWSTRING_SET &set_out, 
+  int list_values (ACE_PWSTRING_SET &set_out,
 		   const char *pattern_in);
   // Get a set of values matching a specified pattern (chars). Matching
   // means the values must begin with the pattern string.
 
-  int list_types (ACE_PWSTRING_SET &set_out, 
+  int list_types (ACE_PWSTRING_SET &set_out,
 		  const ACE_WString &pattern_in);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
-  int list_types (ACE_PWSTRING_SET &set_out, 
+  int list_types (ACE_PWSTRING_SET &set_out,
 		  const char *pattern_in);
   // Get a set of types matching a specified pattern (chars). Matching
   // means the types must begin with the pattern string.
 
-  virtual int list_name_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_name_entries (ACE_BINDING_SET &set_out,
 				 const ACE_WString &pattern_in);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_name_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_name_entries (ACE_BINDING_SET &set_out,
 				 const char *pattern_in);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_value_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_value_entries (ACE_BINDING_SET &set_out,
 				  const ACE_WString &pattern_in);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_value_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_value_entries (ACE_BINDING_SET &set_out,
 				  const char *pattern_in);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_type_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_type_entries (ACE_BINDING_SET &set_out,
 				 const ACE_WString &pattern_in);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_type_entries (ACE_BINDING_SET &set_out, 
+  virtual int list_type_entries (ACE_BINDING_SET &set_out,
 				 const char *pattern_in);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
@@ -228,7 +228,7 @@ private:
   ACE_Name_Space *name_space_;
   // Name space (can be either local or remote) dynamically bound.
 
-  char hostname_[MAXHOSTNAMELEN + 1];   
+  char hostname_[MAXHOSTNAMELEN + 1];
   // Holds the local hostname.
 
   const char *netnameserver_host_;
@@ -281,7 +281,7 @@ public:
   // = Set/Get base address of the underlying allocator
   void base_address (char *address);
   char *base_address (void);
-  
+
   // Set/Get use of registry in naming
   int use_registry (void);
   void use_registry (int);
@@ -293,25 +293,25 @@ public:
   // Return verbose status
 
 private:
-  int debugging_;		
+  int debugging_;
   // Extra debugging info
 
-  int verbosity_;		
+  int verbosity_;
   // Extra verbose messages
 
-  int use_registry_;		
+  int use_registry_;
   // Use Win32 Registry
 
-  int nameserver_port_;	
+  int nameserver_port_;
   // Port to connect to nameserver process.
 
-  const char *nameserver_host_;	
+  const char *nameserver_host_;
   // Hostname of nameserver.
 
-  LPCTSTR namespace_dir_;	
+  LPCTSTR namespace_dir_;
   // Directory to hold name_bindings.
 
-  LPCTSTR process_name_;         
+  LPCTSTR process_name_;
   // Name of this process.
 
   LPCTSTR database_;
diff --git a/ace/Registry_Name_Space.h b/ace/Registry_Name_Space.h
index 0131a71675f..033d74a4bd0 100644
--- a/ace/Registry_Name_Space.h
+++ b/ace/Registry_Name_Space.h
@@ -5,9 +5,9 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Registry_Name_Space
+//    Registry_Name_Space.h
 //
 // = AUTHOR
 //    Irfan Pyarali (irfan@cs.wustl.edu)
@@ -30,13 +30,13 @@ class ACE_Export ACE_Registry_Name_Space : public ACE_Name_Space
   // = TITLE
   //     Interface to a Name Server Database which is maintained
   //     by the Win32 Registry.  Allows to add, change, remove and
-  //     resolve NameBindings. 
+  //     resolve NameBindings.
   //
   // = DESCRIPTION
   //     Manages a Naming Service for a registry name space which includes
   //	 bindings for all contexts. All strings are stored in wide character format.
   //     A Name Binding consists of a name (that's the key), a value
-  //     string. There is no type string support in this Name Space. 
+  //     string. There is no type string support in this Name Space.
 {
 public:
 
@@ -44,21 +44,21 @@ public:
   // Constructor
 
   ACE_Registry_Name_Space (ACE_Name_Options *name_options);
-  // Contacts and opens the registry on the specified server 
+  // Contacts and opens the registry on the specified server
 
   ~ACE_Registry_Name_Space (void);
   // Destructor
 
   int open (ACE_Name_Options *name_options);
-  // Contacts and opens the registry on the specified server 
+  // Contacts and opens the registry on the specified server
 
-  int bind (const ACE_WString &name_in, 
-	    const ACE_WString &value_in, 
+  int bind (const ACE_WString &name_in,
+	    const ACE_WString &value_in,
 	    const char *type_in = "");
   // Bind a new name to a naming context (Wide character strings).
 
-  int rebind (const ACE_WString &name_in, 
-	      const ACE_WString &value_in, 
+  int rebind (const ACE_WString &name_in,
+	      const ACE_WString &value_in,
 	      const char *type_in = "");
   // Overwrite the value or type of an existing name in a
   // ACE_Name_Space or bind a new name to the context, if it didn't
@@ -68,40 +68,40 @@ public:
   // Delete a name from a ACE_Name_Space (Wide charcter strings
   // Interface).
 
-  int resolve (const ACE_WString &name_in, 
-	       ACE_WString &value_out, 
+  int resolve (const ACE_WString &name_in,
+	       ACE_WString &value_out,
 	       char *&type_out);
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting both <value_out> and <type_out>!
-  
-  int list_names (ACE_WSTRING_SET &set_out, 
+
+  int list_names (ACE_WSTRING_SET &set_out,
 		  const ACE_WString &pattern_in);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
-  int list_values (ACE_WSTRING_SET &set_out, 
+  int list_values (ACE_WSTRING_SET &set_out,
 		   const ACE_WString &pattern_in);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
-  int list_types (ACE_WSTRING_SET &set_out, 
+  int list_types (ACE_WSTRING_SET &set_out,
 		  const ACE_WString &pattern_in);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
-  int list_name_entries (ACE_BINDING_SET &set, 
+  int list_name_entries (ACE_BINDING_SET &set,
 			 const ACE_WString &pattern);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  int list_value_entries (ACE_BINDING_SET &set, 
+  int list_value_entries (ACE_BINDING_SET &set,
 			  const ACE_WString &pattern);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  int list_type_entries (ACE_BINDING_SET &set, 
+  int list_type_entries (ACE_BINDING_SET &set,
 			 const ACE_WString &pattern);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index d978fa39e00..9230781c3db 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -7,13 +7,13 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Remote_Name_Space
+//    Remote_Name_Space.h
 //
 // = AUTHOR
 //    Prashant Jain
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_REMOTE_NAME_SPACE_H)
@@ -29,7 +29,7 @@ typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
 
 class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space
   // = TITLE
-  //     Maintaining accesses Remote Name Server Database.  Allows to 
+  //     Maintaining accesses Remote Name Server Database.  Allows to
   //     add NameBindings, change them, remove them and resolve
   //     NameBindings.
   //
@@ -37,7 +37,7 @@ class ACE_Export ACE_Remote_Name_Space : public ACE_Name_Space
   //     Manages a Naming Service for a remote name space which includes
   //	 bindings for net_local naming context.
   //	 All strings are stored in wide character format.
-  //     A Name Binding consists of a name (that's the key), a value 
+  //     A Name Binding consists of a name (that's the key), a value
   //	 string and an optional type string (no wide chars).
 {
 public:
@@ -59,56 +59,56 @@ public:
   // destructor, do some cleanup :TBD: last dtor should "compress"
   // file
 
-  virtual int bind (const ACE_WString &name_in, 
-		    const ACE_WString &value_in, 
+  virtual int bind (const ACE_WString &name_in,
+		    const ACE_WString &value_in,
 		    const char *type_in = "");
   // Bind a new name to a naming context (Wide character strings).
-  
-  virtual int rebind (const ACE_WString &name_in, 
-		      const ACE_WString &value_in, 
+
+  virtual int rebind (const ACE_WString &name_in,
+		      const ACE_WString &value_in,
 		      const char *type_in = "");
   // Overwrite the value or type of an existing name in a
   // ACE_Remote_Name_Space or bind a new name to the context, if it
   // didn't exist yet. (Wide charcter strings interface).
-  
+
   virtual int unbind (const ACE_WString &name_in);
   // Delete a name from a ACE_Remote_Name_Space (Wide charcter strings
   // Interface).
-  
-  virtual int resolve (const ACE_WString &name_in, 
-		       ACE_WString &value_out, 
+
+  virtual int resolve (const ACE_WString &name_in,
+		       ACE_WString &value_out,
 		       char *&type_out);
   // Get value and type of a given name binding (Wide chars).  The
   // caller is responsible for deleting both <value_out> and <type_out>!
-  
-  virtual int list_names (ACE_WSTRING_SET &set_out, 
+
+  virtual int list_names (ACE_WSTRING_SET &set_out,
 			  const ACE_WString &pattern_in);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string.
 
-  virtual int list_values (ACE_WSTRING_SET &set_out, 
+  virtual int list_values (ACE_WSTRING_SET &set_out,
 			   const ACE_WString &pattern_in);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string.
 
-  virtual int list_types (ACE_WSTRING_SET &set_out, 
+  virtual int list_types (ACE_WSTRING_SET &set_out,
 			  const ACE_WString &pattern_in);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string.
 
-  virtual int list_name_entries (ACE_BINDING_SET &set, 
+  virtual int list_name_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern);
   // Get a set of names matching a specified pattern (wchars). Matching
   // means the names must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_value_entries (ACE_BINDING_SET &set, 
+  virtual int list_value_entries (ACE_BINDING_SET &set,
 				  const ACE_WString &pattern);
   // Get a set of values matching a specified pattern (wchars). Matching
   // means the values must begin with the pattern string. Returns the
   // complete binding associated each pattern match.
 
-  virtual int list_type_entries (ACE_BINDING_SET &set, 
+  virtual int list_type_entries (ACE_BINDING_SET &set,
 				 const ACE_WString &pattern);
   // Get a set of types matching a specified pattern (wchars). Matching
   // means the types must begin with the pattern string. Returns the
@@ -116,7 +116,7 @@ public:
 
   virtual void dump (void) const;
   // Dump the state of the object.
-  
+
 private:
 
   ACE_Name_Proxy ns_proxy_;
diff --git a/ace/Strategies.h b/ace/Strategies.h
index 10aa0252a37..a907bb16aad 100644
--- a/ace/Strategies.h
+++ b/ace/Strategies.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//   ACE_Strategies.h 
+//   Strategies.h
 //
 // = AUTHOR
-//    Doug Schmidt 
-// 
+//    Doug Schmidt
+//
 // ============================================================================
 
 #if !defined (ACE_STRATEGIES_H)
@@ -22,7 +22,7 @@
 // Forward decls.
 class ACE_Reactor;
 
-class ACE_Export ACE_Notification_Strategy 
+class ACE_Export ACE_Notification_Strategy
   // = TITLE
   //     Abstract class used for notifing an interested party
   //
@@ -74,7 +74,7 @@ public:
   // Get/Set the reactor
   ACE_Reactor *reactor (void);
   void reactor (ACE_Reactor *r);
-  
+
 protected:
   ACE_Reactor *reactor_;
 };
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index f9b8e48e084..d54d2799407 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -6,9 +6,9 @@
 //
 // = LIBRARY
 //    ACE
-// 
+//
 // = FILENAME
-//    ACE_Token_Collection.h
+//    Token_Collection.h
 //
 // = DESCRIPTION
 //    The ACE_Token class offers methods for acquiring, renewing,
@@ -22,7 +22,7 @@
 // = AUTHOR
 //    Douglas C. Schmidt (schmidt@cs.wustl.edu) and
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_TOKEN_COLLECTION_H)
@@ -34,7 +34,7 @@
 
 class ACE_Export ACE_Token_Collection : public ACE_Token_Proxy
   // = TITLE
-  //   Allows atomic token group operations AND 
+  //   Allows atomic token group operations AND
   //   provides a ACE_Token manager interface.
   //
   // = DESCRIPTION
@@ -61,7 +61,7 @@ public:
   // <debug> print out verbose debugging messages. <name> will give a
   // name to the collection.  Collections don't really need names, but
   // are sometimes useful for debugging.
-  
+
 // Collection Management operations
 
   int insert (ACE_Token_Proxy &token);
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index ceef12958e1..e818b219155 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -6,9 +6,9 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    Token_Invariants
+//    Token_Invariants.h
 //
 // = AUTHOR
 //    Tim Harrison (harrison@cs.wustl.edu)
@@ -157,7 +157,7 @@ public:
   // Dump the state of the class.
 
   // = The following two method should be in the protected part of the
-  //   class.  Bugs with certain compilers preclude this. 
+  //   class.  Bugs with certain compilers preclude this.
   ACE_Token_Invariant_Manager (void);
   // Prevent non-singleton construction.
 
@@ -165,11 +165,11 @@ public:
   // Destruction.
 
 protected:
-  int get_mutex (const char *token_name, 
+  int get_mutex (const char *token_name,
                  ACE_Mutex_Invariants *&inv);
   // Return or create.
 
-  int get_rwlock (const char *token_name, 
+  int get_rwlock (const char *token_name,
                   ACE_RWLock_Invariants *&inv);
   // Return or create.
 
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index a0174565a75..1da3f962104 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -5,13 +5,13 @@
 //
 // = LIBRARY
 //    ace
-// 
+//
 // = FILENAME
-//    Token_Manager
+//    Token_Manager.h
 //
 // = AUTHOR
 //    Tim Harrison (harrison@cs.wustl.edu)
-// 
+//
 // ============================================================================
 
 #if !defined (ACE_TOKEN_MANAGER_H)
@@ -54,7 +54,7 @@ public:
     // an existing token.  If none is found, the Token Manager calls
     // ACE_Token_Proxy::create_token to create a new one.  When
     // finished, sets ACE_Token_Proxy::token_.  <token_name> uniquely
-    // id's the token name. 
+    // id's the token name.
 
     int check_deadlock (ACE_Token_Proxy *proxy);
     int check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy);