ChangeLogTag:Thu May 23 07:53:37 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

8 files changed, 47 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 7aeb77c837f..563d77b90d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu May 23 07:53:37 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* examples/Misc/test_read_buffer.cpp (ACE_TMAIN): Use ACE_STDIN
+	  rather than 0.  Thanks to Soeren Gerlach <soeren.gerlach@gmx.de>
+	  for motivating this.
+
+Tue May 21 06:13:50 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Manager_Ex): Made
+	  shared_find() protected rather than private.  Thanks to
+	  Ganesh Pai <GPai@sonusnet.com> for reporting this.
+
 Wed May 22 23:18:26 2002  Priyanka  <oci@cs.wustl.edu>
 
         * ACE version 5.2.3 released.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 7aeb77c837f..563d77b90d2 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Thu May 23 07:53:37 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* examples/Misc/test_read_buffer.cpp (ACE_TMAIN): Use ACE_STDIN
+	  rather than 0.  Thanks to Soeren Gerlach <soeren.gerlach@gmx.de>
+	  for motivating this.
+
+Tue May 21 06:13:50 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Manager_Ex): Made
+	  shared_find() protected rather than private.  Thanks to
+	  Ganesh Pai <GPai@sonusnet.com> for reporting this.
+
 Wed May 22 23:18:26 2002  Priyanka  <oci@cs.wustl.edu>
 
         * ACE version 5.2.3 released.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 7aeb77c837f..563d77b90d2 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Thu May 23 07:53:37 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* examples/Misc/test_read_buffer.cpp (ACE_TMAIN): Use ACE_STDIN
+	  rather than 0.  Thanks to Soeren Gerlach <soeren.gerlach@gmx.de>
+	  for motivating this.
+
+Tue May 21 06:13:50 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* ace/Hash_Map_Manager_T.h (class ACE_Hash_Map_Manager_Ex): Made
+	  shared_find() protected rather than private.  Thanks to
+	  Ganesh Pai <GPai@sonusnet.com> for reporting this.
+
 Wed May 22 23:18:26 2002  Priyanka  <oci@cs.wustl.edu>
 
         * ACE version 5.2.3 released.
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index c2043426f7b..9830a91fe59 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -50,8 +50,11 @@ Tue May 21 16:10:11 2002 Ru Gunatilleke <ru@ociweb.com>
 	* examples/RTCORBA/Activity/README: Fixed the description on
 	  supplying the service configurator file.
 
-	* examples/RTCORBA/Activity/svc.conf.server: Added -POACount 1
-	  and -JobCount 2
+	* examples/RTCORBA/Activity/svc.conf.server: Added -POACount 1 
+	  and -JobCount 2.  Thanks to Patrick Lardieri
+ 	  <patrick.j.lardieri@lmco.com> and Gautam Thaker
+ 	  <gthaker@atl.lmco.com> for reporting this and to
+	  Pradeep Gore for supplying the fix.
 
 Tue May 21 15:53:07 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
diff --git a/THANKS b/THANKS
index 2ec0e724ad3..6339447ed38 100644
--- a/THANKS
+++ b/THANKS
@@ -1514,7 +1514,7 @@ Peter Kullmann <P.Kullmann@rog.de>
 Lyn Headley <headley@wolve.com>
 Jeff Adams <Jeff.Adams@gd-ais.com>
 Timothy Culp <timothy.culp@computer.org>
-Oleg Terletsky <oterletsky@comcast.net>
+Oleg Oterletsky <oterletsky@comcast.net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h
index 08a3b281f41..a62ea2bafaf 100644
--- a/ace/Hash_Map_Manager_T.h
+++ b/ace/Hash_Map_Manager_T.h
@@ -438,12 +438,13 @@ protected:
   /// Function object used for comparing keys.
   COMPARE_KEYS compare_keys_;
 
-private:
+protected:
   /// Returns the <ACE_Hash_Map_Entry> that corresponds to <ext_id>.
   int shared_find (const EXT_ID &ext_id,
                    ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry,
                    u_long &loc);
 
+private:
   /**
    * Array of <ACE_Hash_Map_Entry> *s, each of which points to an
    * <ACE_Hash_Map_Entry> that serves as the beginning of a linked
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index 41ca78a4eee..f2d77add242 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -6,12 +6,11 @@
  *
  *  $Id$
  *
- *  @author Doug Schmidt
- *  @author Seth Widoff
+ *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
+ *  @author Seth Widoff 
  */
 //==========================================================================
 
-
 #ifndef ACE_READ_BUFFER_H
 #define ACE_READ_BUFFER_H
 
@@ -27,7 +26,6 @@
 
 class ACE_Allocator;
 
-
 /**
  * @class ACE_Read_Buffer
  *
diff --git a/examples/Misc/test_read_buffer.cpp b/examples/Misc/test_read_buffer.cpp
index e1d1cf0c0c8..f75c3d1023e 100644
--- a/examples/Misc/test_read_buffer.cpp
+++ b/examples/Misc/test_read_buffer.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(Misc, test_read_buffer, "$Id$")
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_HANDLE handle = argc > 1 ? ACE_OS::open (argv[1], O_RDONLY) : 0;
+  ACE_HANDLE handle = argc > 1 ? ACE_OS::open (argv[1], O_RDONLY) : ACE_STDIN;
   int term = argc > 2 ? ACE_OS::atoi (argv[2]) : EOF;
   int search = argc > 3 ? ACE_OS::atoi (argv[3]) : '\n';
   int replace = argc > 4 ? ACE_OS::atoi (argv[4]) : '\0';