*** empty log message ***

9 files changed, 15 insertions, 14 deletions

diff --git a/FAQ b/FAQ
index bab85562258..21a3ef9d7c2 100644
--- a/FAQ
+++ b/FAQ
@@ -1344,7 +1344,7 @@ UNIX system calls directly (regardless of whether you use ACE or not).
    	to maintain software.  Sockets and TLI are *incredibly*
    	error-prone and tedious to use, in addition to being
    	non-portable.  I've got a paper that discusses this in detail
-	at URL http://www.cs.wustl.edu/~schmidt/COOTS-95.ps.Z
+	at URL http://www.cs.wustl.edu/~schmidt/COOTS-95.ps.gz.
 	
 3. Incorporation with higher-level patterns and programming methods -- 
 
diff --git a/Makefile b/Makefile
index c878469b621..064258ec589 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ RELEASE_FILES = ACE_wrappers/ACE-categories \
 	        ACE_wrappers/ACE-install.sh \
 	        ACE_wrappers/ACE-lessons.html \
 	        ACE_wrappers/BIBLIOGRAPHY \
+	        ACE_wrappers/ChangeLog-97b \
 	        ACE_wrappers/ChangeLog-97a \
 	        ACE_wrappers/ChangeLog-96b \
 	        ACE_wrappers/ChangeLog-96a \
diff --git a/README b/README
index a8e723b401d..c4a1216529b 100644
--- a/README
+++ b/README
@@ -463,7 +463,7 @@ Anthony McConnell <Tonym@datel.demon.co.uk>
 Mark Rabotnikov <mark@usp.elscintcorp.co.il>
 John Bossom <John.Bossom@Cognos.COM>
 Rino Simioni <sir@necsy.it>
-Carlos O'Ryan <coryan@mat.puc.cl>
+Carlos O''Ryan <coryan@mat.puc.cl>
 Slawomir Kuzniar <kuzniar@Bear.COM>
 Nanbor Wang <nw1@cs.wustl.edu>
 Rob Jordan <jordan@hursley.ibm.com>
@@ -519,6 +519,7 @@ Reza Roodsari <reza@sprynet.com>
 Jim Crossley <jim@lads.com>
 Johannes Gutleber <Johannes.Gutleber@cern.ch> 
 Marina Spivak <marina@cs.wustl.edu>
+Erik Urdang <erik@bhi.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 4373702fb48..2c1b5379112 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Fri Jul  4 00:18:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* tao/roa.h: Removed derogatory COMments ;-).  Thanks to Anton van
+ 	  Straaten <anton@appsolutions.com> for reporting this.
+
 Thu Jul  3 16:16:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
 
 	* Added ACE_Svc_Export to a couple of declarations to make NT 
diff --git a/TAO/tao/roa.h b/TAO/tao/roa.h
index 4a7e7da23b4..6e26e0de2d0 100644
--- a/TAO/tao/roa.h
+++ b/TAO/tao/roa.h
@@ -109,7 +109,6 @@ public:
   void please_shutdown (CORBA_Environment &env);
 
   // = COM IUnknown Support
-  //     The <__stdcall> needs to remain here until we get rid of COM crap.
   ULONG __stdcall AddRef (void);
   ULONG __stdcall Release (void);
   HRESULT __stdcall QueryInterface (REFIID riid, void** ppv);
diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index 746aff21a41..b8a25f07282 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -15,9 +15,9 @@ ACE_Free_List<T>::~ACE_Free_List (void)
   // Nothing
 }
 
-
-// Default constructor that takes in a preallocation number (<prealloc>), a 
-// low and high water mark (<lwm> and <hwm>) and an increment value (<inc>)
+// Default constructor that takes in a preallocation number
+// (<prealloc>), a low and high water mark (<lwm> and <hwm>) and an
+// increment value (<inc>)
 
 template <class T, class LOCK>  
 ACE_Locked_Free_List<T, LOCK>::ACE_Locked_Free_List (size_t prealloc, 
@@ -36,7 +36,6 @@ ACE_Locked_Free_List<T, LOCK>::ACE_Locked_Free_List (size_t prealloc,
   this->alloc (prealloc);
 }
 
-
 // Destructor - removes all the elements from the free_list
 
 template <class T, class LOCK>  
@@ -53,7 +52,6 @@ ACE_Locked_Free_List<T, LOCK>::~ACE_Locked_Free_List (void)
     delete this->mutex_;
 }
 
-
 // Allocates <n> extra nodes for the freelist
 
 template <class T, class LOCK> void 
@@ -69,7 +67,6 @@ ACE_Locked_Free_List<T, LOCK>::alloc (size_t n)
     }
 }
 
-
 // Removes and frees <n> nodes from the freelist
 
 template <class T, class LOCK> void 
@@ -84,7 +81,6 @@ ACE_Locked_Free_List<T, LOCK>::dealloc (size_t n)
     }
 }
 
-
 // returns a reference to the mutex
 template <class T, class LOCK> LOCK &
 ACE_Locked_Free_List<T, LOCK>::get_mutex (void)
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index d786e4a9b3f..374582dc70a 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -755,7 +755,6 @@ ACE_RW_Token::acquire (ACE_TPQ_Entry *caller,
   ACE_RETURN (-1);
 }
 
-
 int 
 ACE_RW_Token::tryacquire (ACE_TPQ_Entry *caller)
 {
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index c7e58775ccc..02eb22a98cf 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -402,7 +402,7 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs,
 
 // There's no point in dealing with this on NT since it doesn't really
 // support signals very well...
-#if defined (ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_LACKS_UNIX_SIGNALS)
   // This really ought to be a Singleton I suspect...
 
   if (ACE_Service_Config::reactor_->register_handler 
@@ -440,7 +440,7 @@ ACE_Service_Config::parse_args (int argc, char *argv[])
 	{
 // There's no point in dealing with this on NT since it doesn't really
 // support signals very well...
-#if defined (ACE_LACKS_UNIX_SIGNALS)
+#if !defined (ACE_LACKS_UNIX_SIGNALS)
 	  ACE_Service_Config::signum_ = ACE_OS::atoi (getopt.optarg);
 
 	  if (ACE_Service_Config::reactor ()->register_handler 
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index b5d96080c9b..a21eadd7a43 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -206,7 +206,7 @@ public:
 
   // = Cancel methods, which provides a cooperative thread-termination mechanism (will not block).
   int cancel_all (void);
-  // Send signum to all stopped threads 
+  // Cancel's all the threads.
   int cancel (ACE_thread_t);
   // Cancel a single thread.
   int cancel_grp (int grp_id);