ChangeLogTag:Sat Sep 29 08:07:07 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

9 files changed, 47 insertions, 26 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 1f9e2f6aaa8..ffc53fc3faf 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -1186,10 +1186,9 @@ need to do:<P>
 <P><hr align=left width="50%"><P>
 <H4><A NAME="win32">Building and Installing ACE on Win32</A></H4>
 
-If you are looking for instructions on building ACE with Borland
-C++Builder, go <A HREF="#borland">here</A>.  Otherwise, if you are
-looking for instructions on building ACE with Mingw, go <A
-HREF="#mingw">here</A>. <P>
+Below are instructions for building ACE with <A
+HREF="#borland">Borland C++Builder</A>, <A HREF="#msvc">Microsoft
+Visual C++</A> and <A HREF="#mingw">Mingw</A>. <P>
 
 First, if you are upgrading from an older release, clean up everything
 and rebuild from scratch to ensure that everything is rebuilt
@@ -1297,6 +1296,10 @@ Dynamic\Release</CODE></BLOCKQUOTE><P> or the the batch file:<P>
 sure the ACE bin directory (in this case ACE_ROOT\bin\Dynamic\Release)
 is on the path before you try to run the tests.<p>
 
+<P><hr align=left width="50%"><P>
+<H4><A NAME="msvc">Building and Installing ACE on Win32 with
+Microsoft Visual C++</A></H4>
+
 <EM>Note concerning MSVC 5.0 and Service Pack 3:</EM> There has been
 confusion regarding MSVC 5 and its Service Pack 3.  Some ACE users
 have, in the past, had problems with SP3 that were not present in SP2.
diff --git a/ChangeLog b/ChangeLog
index 0b51ccc564f..1b1e08d46a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep 29 08:07:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Configuration.{h,cpp}: Changed "allocator" to "alloc" to
+	  avoid bugs with MSVC++ 5.0.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
+	* ACE-INSTALL.html: Yet more improvements courtesy of Chris
+ 	  Kohloff.
+
 Fri Sep 28 23:38:07 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Accept_Handler.cpp (ssl_accept):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0b51ccc564f..1b1e08d46a4 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Sat Sep 29 08:07:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Configuration.{h,cpp}: Changed "allocator" to "alloc" to
+	  avoid bugs with MSVC++ 5.0.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
+	* ACE-INSTALL.html: Yet more improvements courtesy of Chris
+ 	  Kohloff.
+
 Fri Sep 28 23:38:07 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Accept_Handler.cpp (ssl_accept):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0b51ccc564f..1b1e08d46a4 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Sat Sep 29 08:07:07 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Configuration.{h,cpp}: Changed "allocator" to "alloc" to
+	  avoid bugs with MSVC++ 5.0.  Thanks to Munagala Ramanath
+ 	  <amberarrow@yahoo.com> for reporting this.
+
+	* ACE-INSTALL.html: Yet more improvements courtesy of Chris
+ 	  Kohloff.
+
 Fri Sep 28 23:38:07 2001  Ossama Othman  <ossama@uci.edu>
 
 	* ace/SSL/SSL_Accept_Handler.cpp (ssl_accept):
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index 5e0c3834e04..5b183c46294 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -1035,18 +1035,14 @@ ACE_Configuration_Value_IntId& ACE_Configuration_Value_IntId::operator= (const A
 }
 
 void
-ACE_Configuration_Value_IntId::free (ACE_Allocator* allocator)
+ACE_Configuration_Value_IntId::free (ACE_Allocator *alloc)
 {
   if (this->type_ == ACE_Configuration::STRING
       || this->type_ == ACE_Configuration::BINARY)
-    {
-      allocator->free ((void *) (data_));
-    }
+    alloc->free ((void *) (data_));
   // Do nothing in other cases...
 }
 
-/////////////////////////////////////////////////////////////////////////////
-
 ACE_Configuration_ExtId::ACE_Configuration_ExtId (void)
   : name_ (0)
 {
@@ -1100,9 +1096,9 @@ ACE_Configuration_ExtId::name (void)
 }
 
 void
-ACE_Configuration_ExtId::free (ACE_Allocator* allocator)
+ACE_Configuration_ExtId::free (ACE_Allocator *alloc)
 {
-  allocator->free ((void *) (name_));
+  alloc->free ((void *) (name_));
 }
 
 ///////////////////////////////////////////////////////////////////////
@@ -1142,10 +1138,10 @@ ACE_Configuration_Section_IntId::operator= (const ACE_Configuration_Section_IntI
 }
 
 void
-ACE_Configuration_Section_IntId::free (ACE_Allocator* allocator)
+ACE_Configuration_Section_IntId::free (ACE_Allocator *alloc)
 {
-  allocator->free ((void *) (value_hash_map_));
-  allocator->free ((void *) (section_hash_map_));
+  alloc->free ((void *) (value_hash_map_));
+  alloc->free ((void *) (section_hash_map_));
 }
 
 ACE_Configuration_Section_Key_Heap::ACE_Configuration_Section_Key_Heap (const ACE_TCHAR* path)
diff --git a/ace/Configuration.h b/ace/Configuration.h
index 62593cd4d63..95eba681a12 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -473,7 +473,7 @@ public:
 
   /// Frees the name of the value.  needed since we don't know the
   /// allocator name_ was created in
-  void free (ACE_Allocator* allocator);
+  void free (ACE_Allocator *alloc);
 
   /// <hash> function is required in order for this class to be usable by
   /// ACE_Hash_Map_Manager.
@@ -531,7 +531,7 @@ public:
   ACE_Configuration_Value_IntId& operator= (
     const ACE_Configuration_Value_IntId& rhs);
 
-  void free (ACE_Allocator* allocator);
+  void free (ACE_Allocator *alloc);
 
   // = Data members.
 
@@ -587,7 +587,7 @@ public:
     const ACE_Configuration_Section_IntId& rhs);
 
   /// frees the hash table and all its values
-  void free (ACE_Allocator* allocator);
+  void free (ACE_Allocator *alloc);
 
   // = Data Members.
   VALUE_MAP* value_hash_map_;
diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h
index c1c5c712ce6..0b04fe130d8 100644
--- a/ace/Hash_Map_With_Allocator_T.h
+++ b/ace/Hash_Map_With_Allocator_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_HASH_MAP_WITH_ALLOCATOR_T_H
 #define ACE_HASH_MAP_WITH_ALLOCATOR_T_H
 #include "ace/pre.h"
@@ -39,7 +38,6 @@
  *     is meaningful!  That is why we need this wrapper, which
  *     insures that appropriate allocator pointer is in place for
  *     each call.
- *
  */
 template <class EXT_ID, class INT_ID>
 class ACE_Hash_Map_With_Allocator :
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index c74de19141c..2801a8be3c4 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -6,11 +6,10 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_SERVICE_OBJECT_H
 #define ACE_SERVICE_OBJECT_H
 #include "ace/pre.h"
diff --git a/ace/Shared_Object.h b/ace/Shared_Object.h
index 33f0231a3c2..dc6d1ed7480 100644
--- a/ace/Shared_Object.h
+++ b/ace/Shared_Object.h
@@ -1,17 +1,15 @@
 /* -*- C++ -*- */
 
-
 //=============================================================================
 /**
  *  @file    Shared_Object.h
  *
  *  $Id$
  *
- *  @author Doug Schmidt
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #ifndef ACE_SHARED_OBJECT_H
 #define ACE_SHARED_OBJECT_H
 #include "ace/pre.h"
@@ -39,7 +37,7 @@ public:
   /// Terminates object when dynamic unlinking occurs.
   virtual int fini (void);
 
-  /// Returns information on active object.
+  /// Returns information on a service object.
   virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
 
   virtual ~ACE_Shared_Object (void);