*** empty log message ***

6 files changed, 41 insertions, 37 deletions

diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
index 1072c3a8407..b21a7e39b2e 100644
--- a/ace/Hash_Map_Manager.cpp
+++ b/ace/Hash_Map_Manager.cpp
@@ -97,14 +97,14 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::resize_i (size_t size)
 
 template <class EXT_ID, class INT_ID, class LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::open (size_t size,
-						  ACE_Allocator *allocator)
+						  ACE_Allocator *alloc)
 {
   ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
 
-  if (allocator == 0)
-    allocator = ACE_Service_Config::alloc ();
+  if (alloc == 0)
+    alloc = ACE_Service_Config::alloc ();
 
-  this->allocator_ = allocator;
+  this->allocator_ = alloc;
 
   // This assertion is here to help track a situation that shouldn't happen,
   // but did with Sun C++ 4.1 (before a change to this class was made:
@@ -121,22 +121,22 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::open (size_t size,
 
 template <class EXT_ID, class INT_ID, class LOCK>
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::ACE_Hash_Map_Manager (size_t size,
-								  ACE_Allocator *allocator)
-  : allocator_ (allocator),
+								  ACE_Allocator *alloc)
+  : allocator_ (alloc),
     total_size_ (0),
     cur_size_ (0)
 {
-  if (this->open (size, allocator) == -1)
+  if (this->open (size, alloc) == -1)
     ACE_ERROR ((LM_ERROR, "ACE_Hash_Map_Manager\n"));
 }
 
 template <class EXT_ID, class INT_ID, class LOCK> 
-ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::ACE_Hash_Map_Manager (ACE_Allocator *allocator)
-  : allocator_ (allocator),
+ACE_Hash_Map_Manager<EXT_ID, INT_ID, LOCK>::ACE_Hash_Map_Manager (ACE_Allocator *alloc)
+  : allocator_ (alloc),
     total_size_ (0),
     cur_size_ (0)
 {
-  if (this->open (ACE_DEFAULT_MAP_SIZE, allocator) == -1)
+  if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1)
     ACE_ERROR ((LM_ERROR, "ACE_Hash_Map_Manager\n"));
 }
 
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 0284a8c3ddb..2879a0ab941 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -79,14 +79,14 @@ public:
   // = Initialization and termination methods.
 
   ACE_Hash_Map_Manager (size_t size, 
-			ACE_Allocator *allocator = 0);
+			ACE_Allocator *alloc = 0);
   // Initialize a <Hash_Map_Manager> with size <length>.
 
-  ACE_Hash_Map_Manager (ACE_Allocator *allocator = 0);
+  ACE_Hash_Map_Manager (ACE_Allocator *alloc = 0);
   // Initialize a <Hash_Map_Manager> with default size.
 
   int open (size_t length = ACE_DEFAULT_MAP_SIZE, 
-	    ACE_Allocator *allocator = 0);
+	    ACE_Allocator *alloc = 0);
   // Initialize a <Hash_Map_Manager> with size <length>.
 
   int close (void);
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 07b14b0b6fc..863cdf916dd 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -57,7 +57,7 @@ class ACE_Name_Space_Map : public MAP_MANAGER
   //     guaranteed the address of the SHARED_MALLOC allocator is
   //     meaningful!
 public:
-  ACE_Name_Space_Map (ALLOCATOR *allocator);
+  ACE_Name_Space_Map (ALLOCATOR *alloc);
   // Constructor.
 
   // = The following methods are Proxies to the underlying methods
@@ -66,23 +66,23 @@ public:
   // process, and then call down to perform the intended operation.
   int bind (const ACE_NS_String &, 
 	    const ACE_NS_Internal &,
-	    ALLOCATOR *allocator);
+	    ALLOCATOR *alloc);
 
   int unbind (const ACE_NS_String &, 
 	      ACE_NS_Internal &,
-	      ALLOCATOR *allocator);
+	      ALLOCATOR *alloc);
 
   int rebind (const ACE_NS_String &, 
 	      const ACE_NS_Internal &,
 	      ACE_NS_String &, 
 	      ACE_NS_Internal &,
-	      ALLOCATOR *allocator);
+	      ALLOCATOR *alloc);
 
   int find (const ACE_NS_String &, 
 	    ACE_NS_Internal &,
-	    ALLOCATOR *allocator);
+	    ALLOCATOR *alloc);
 
-  int close (ALLOCATOR* allocator);
+  int close (ALLOCATOR *alloc);
   
 private:
 };
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 3aca98d11f5..74ec2902f33 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -82,15 +82,15 @@ public:
   typedef ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, LOCK> REVERSE_ITERATOR;
 
   // = Initialization and termination methods.
-  ACE_Map_Manager (ACE_Allocator *allocator = 0);
+  ACE_Map_Manager (ACE_Allocator *alloc = 0);
   // Initialize a <Map_Manager> with the <ACE_DEFAULT_MAP_SIZE>.
 
   ACE_Map_Manager (size_t size, 
-		   ACE_Allocator *allocator = 0);
+		   ACE_Allocator *alloc = 0);
   // Initialize a <Map_Manager> with <size> entries.
 
   int open (size_t length = ACE_DEFAULT_MAP_SIZE, 
-	    ACE_Allocator *allocator = 0);
+	    ACE_Allocator *alloc = 0);
   // Initialize a <Map_Manager> with size <length>.
 
   int close (void);
diff --git a/ace/SString.h b/ace/SString.h
index 4d5612c83c0..cac2d5ea416 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -42,23 +42,23 @@ class ACE_Export ACE_CString
   friend ACE_CString operator+ (const ACE_CString &, const ACE_CString &);
   friend ostream &operator << (ostream &, const ACE_CString &);
 public:
-  ACE_CString (ACE_Allocator *allocator = 0);
+  ACE_CString (ACE_Allocator *alloc = 0);
   // Default constructor.
 
-  ACE_CString (const char *s, ACE_Allocator *allocator = 0);
+  ACE_CString (const char *s, ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory. 
 
   ACE_CString (const ACE_CString &);
   // Copy constructor.
 
-  ACE_CString (const ACE_USHORT16 *s, ACE_Allocator *allocator = 0);
+  ACE_CString (const ACE_USHORT16 *s, ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory.
   // Probable loss of data. Please use with care.
 
   ~ACE_CString (void);
   // Deletes the memory...
 
-  ACE_CString (const char *s, size_t len, ACE_Allocator *allocator = 0);
+  ACE_CString (const char *s, size_t len, ACE_Allocator *alloc = 0);
   // Constructor that copies <len> chars of <s> into dynamically
   // allocated memory (will NUL terminate the result).
 
@@ -140,10 +140,10 @@ public:
   ACE_SString (ACE_Allocator *allocator = 0);
   // Default constructor.
 
-  ACE_SString (const char *s, ACE_Allocator *allocator = 0);
+  ACE_SString (const char *s, ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory. 
 
-  ACE_SString (const char *s, size_t len, ACE_Allocator *allocator = 0);
+  ACE_SString (const char *s, size_t len, ACE_Allocator *alloc = 0);
   // Constructor that copies <len> chars of <s> into dynamically
   // allocated memory (will NUL terminate the result).
 
@@ -218,20 +218,24 @@ class ACE_Export ACE_WString
 {
   friend ACE_WString operator+ (const ACE_WString &, const ACE_WString &);
 public:
-  ACE_WString (ACE_Allocator *allocator = 0);
+  ACE_WString (ACE_Allocator *alloc = 0);
   // Default constructor.
 
-  ACE_WString (const char *s, ACE_Allocator *allocator = 0);
+  ACE_WString (const char *s, 
+	       ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory.
 
-  ACE_WString (const ACE_USHORT16 *s, ACE_Allocator *allocator = 0);
+  ACE_WString (const ACE_USHORT16 *s, 
+	       ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory.
 
-  ACE_WString (const ACE_USHORT16 *s, size_t len, ACE_Allocator *allocator = 0);
+  ACE_WString (const ACE_USHORT16 *s, 
+	       size_t len, 
+	       ACE_Allocator *alloc = 0);
   // Constructor that copies <len> ACE_USHORT16's of <s> into dynamically
   // allocated memory (will NUL terminate the result).
 
-  ACE_WString (size_t len, ACE_Allocator *allocator = 0);
+  ACE_WString (size_t len, ACE_Allocator *alloc = 0);
   // Constructor that dynamically allocates memory for <len> + 1
   // ACE_USHORT16 characters. The newly created memory is set memset to 0.
 
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index e89004fd6e7..1895bdf4fe2 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -209,8 +209,8 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   if (result != 0)
     {
       // _Don't_ clobber errno here!  result is either 0 or -1, and
-      // ACE_OS::thr_create () already set errno!    D. Levine 28 Mar 1997
-      // errno = result;
+      // ACE_OS::thr_create () already set errno!  D. Levine 28 Mar
+      // 1997 errno = result;
       return -1;
     }
   else
@@ -219,8 +219,8 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
 			     grp_id, task);
 }
 
-// Create a new thread running FUNC.  *Must* be called with the lock_
-// held...
+// Create a new thread running <func>.  *Must* be called with the
+// <lock_> held...
 
 int 
 ACE_Thread_Manager::spawn (ACE_THR_FUNC func,