.

7 files changed, 38 insertions, 19 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 86c78697ff0..5135d91bb86 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,10 @@
+Thu Jan 14 11:46:25 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Synch_T.h: Pointed out that we can only parameterize
+	  ACE_Condition<> with ACE_Thread_Mutex and ACE_Null_Mutex.
+	  Thanks to Knut-Havard Aksnes <knut@orion.no> for reporting
+	  this.
+
 Thu Jan 14 02:33:37 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.6.13 released.
diff --git a/README b/README
index 7926363489b..385e85112e5 100644
--- a/README
+++ b/README
@@ -698,7 +698,7 @@ Tom Ziomek <tomz@cc.comm.mot.com>
 Hamish Friedlander <hamishf@usa.net>
 Mark De Jong <mdj@intervu.net>
 Knut Johannessen <knutj@funcom.com>
-Leif Jakobsmeier" <leif@informatik.uni-frankfurt.de>
+Leif Jakobsmeier <leif@informatik.uni-frankfurt.de>
 Jon Lindgren <jlindgren@SLK.com>
 Steve Vinoski <vinoski@iona.com>
 Christian Mueffling <cvm@aiss.de>
@@ -733,6 +733,8 @@ Peter Weat <weatp@syntron.com>
 Magnus Karlsson <magnus.karlsson@syncom.se>
 Andreas Tobler <toa@pop.agri.ch>
 John Aughey <jha@FreeBSD.ORG>
+Knut-Havard Aksnes <knut@orion.no> 
+Eric Mitchell <emitchell@altaira.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-99c b/TAO/ChangeLog-99c
index 1790090898b..7ee60931242 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,10 @@
+Thu Jan 14 11:51:31 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Event/Event_Channel.h,
+ 	  orbsvcs/orbsvcs/Trader/Service_Type_Repository.h: Changed a
+ 	  private: to public: to fix a problem on IRIX 6.4.  Thanks to
+ 	  Eric Mitchell <emitchell@altaira.com> for reporting this.
+
 Thu Jan 14 02:46:56 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * TAO version 0.2.49 released.
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 7c7435e0770..13ebc1d977c 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -29,7 +29,7 @@
       <dt><a HREF="compiler.html">TAO IDL Compiler Options</a> </dt><P>
       <dt><a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
       <dt><a HREF="poa_migration.html">POA Migration Notes</a> </dt><P>
-      <dt><a HREF="implrepo.html">Implementation Repository</a> </dt><P>
+      <dt><a HREF="implrepo/">Implementation Repository</a> </dt><P>
     </dl>
     </td></font>
   </tr>
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 4a1b1302219..adbc3354e09 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -278,22 +278,6 @@ private:
   void cleanup_observers (void);
   // Remove all the observers, this simplifies the shutdown process.
 
-private:
-  ACE_RTU_Manager *rtu_manager_;
-  // The RTU manager dude!
-
-  u_long type_;
-  // Can be any **_CHANNEL. (well, except NO_CHANNEL).
-
-  u_long state_;
-  // Can be INITIAL_STATE, NO_CONSUMERS, NO_SUPPLIERS, or SHUTDOWN.
-
-  ACE_ES_MUTEX lock_;
-  // Used to lock shared state.
-
-  int destroyed_;
-  // Ensures this->destory is executed only once.
-
   struct Observer_Entry
   {
     // = TITLE
@@ -320,6 +304,22 @@ private:
 
   };
 
+private:
+  ACE_RTU_Manager *rtu_manager_;
+  // The RTU manager dude!
+
+  u_long type_;
+  // Can be any **_CHANNEL. (well, except NO_CHANNEL).
+
+  u_long state_;
+  // Can be INITIAL_STATE, NO_CONSUMERS, NO_SUPPLIERS, or SHUTDOWN.
+
+  ACE_ES_MUTEX lock_;
+  // Used to lock shared state.
+
+  int destroyed_;
+  // Ensures this->destory is executed only once.
+
   typedef ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,Observer_Entry,ACE_Null_Mutex> Observer_Map;
   typedef ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,Observer_Entry,ACE_Null_Mutex> Observer_Map_Iterator;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 1be09f077cc..62ab4388ae2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -201,7 +201,7 @@ public:
   // exception is raised.
   // END SPEC
 
-private:
+public:
 
   struct Type_Info
   {
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index 002315fb069..85bc500ab04 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -732,6 +732,7 @@ class ACE_Condition
   //     ACE_Condition variable wrapper, which allows threads to block
   //     until shared data changes state.
   //
+  // = DESCRIPTION
   //     A condition variable enables threads to atomically block and
   //     test the condition under the protection of a mutual exclu-
   //     sion lock (mutex) until the condition is satisfied.  That is,
@@ -744,6 +745,8 @@ class ACE_Condition
   //     variable.  The waiting threads, upon awakening, reacquire the
   //     mutex and re-evaluate the condition.
   //
+  //     Note, you can only parameterize <ACE_Condition> with
+  //     <ACE_Thread_Mutex> or <ACE_Null_Mutex>.
 public:
   // = Initialiation and termination methods.
   ACE_Condition (MUTEX &m, int type = USYNC_THREAD,