ChangeLogTag: Fri Sep 24 08:27:28 1999 David L. Levine <levine@cs.wustl.edu>

5 files changed, 21 insertions, 47 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 8e7d501d894..60881987a06 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,18 +1,26 @@
+Fri Sep 24 08:27:28 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/OS.*,Synch.cpp: reverted changes of:
+
+          Thu Sep 23 11:13:38 1999  Wei Chiang <wei.chiang@nokia.com>
+
+          because Bug 342 proposes a more general fix.
+
 Thu Sep 23 19:02:47 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
 
-	* examples/QOS/server.cpp (main): 
-	* examples/QOS/server.cpp (main): 
+        * examples/QOS/server.cpp (main):
+        * examples/QOS/server.cpp (main):
 
-	  Removed the instantiation of ACE_OS_Object_Manager from 
-	  the above files. This is done automagically in ACE.
-	
-	* examples/QOS/Sender_QOS_Event_Handler.h:
-	  Fixed a warning regarding the #def of MY_DEFPORT.
+          Removed the instantiation of ACE_OS_Object_Manager from
+          the above files. This is done automagically in ACE.
+
+        * examples/QOS/Sender_QOS_Event_Handler.h:
+          Fixed a warning regarding the #def of MY_DEFPORT.
 
 Thu Sep 23 14:12:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* bin/auto_compile:
-	  It was reporting success even when things failed.
+        * bin/auto_compile:
+          It was reporting success even when things failed.
 
 Thu Sep 23 11:13:38 1999  Wei Chiang <wei.chiang@nokia.com>
 
diff --git a/ace/OS.cpp b/ace/OS.cpp
index a7b6c4c6e35..eb33d215e31 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -5468,21 +5468,12 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
   if (ACE_OS::condattr_init (attributes, type) == 0)
     {
       if (ACE_OS::mutex_init (&rw->lock_, type, name1, arg) == 0
-#if defined(CHORUS)
-          && ACE_OS::cond_init (&rw->waiting_readers_,
-                                attributes, name2, arg, 0) == 0
-          && ACE_OS::cond_init (&rw->waiting_writers_,
-                                attributes, name3, arg, 0) == 0
-          && ACE_OS::cond_init (&rw->waiting_important_writer_,
-                                attributes, name4, arg, 0) == 0)
-#else  /* ! CHORUS */
           && ACE_OS::cond_init (&rw->waiting_readers_,
                                 attributes, name2, arg) == 0
           && ACE_OS::cond_init (&rw->waiting_writers_,
                                 attributes, name3, arg) == 0
           && ACE_OS::cond_init (&rw->waiting_important_writer_,
                                 attributes, name4, arg) == 0)
-#endif /* ! CHORUS */
         {
           // Success!
           rw->ref_count_ = 0;
diff --git a/ace/OS.h b/ace/OS.h
index 1cfbc1763fd..425bda1f541 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5398,15 +5398,7 @@ public:
   static int cond_init (ACE_cond_t *cv,
                         ACE_condattr_t &attributes,
                         LPCTSTR name = 0,
-                        void *arg = 0
-#if defined(CHORUS)
-                        ,
-                        int dummy = 0
-#endif /* CHORUS */
-                        );
-    // Use a "dummy" prameter to overcome Chorus compiler error:
-    // Parameters int and int are regarded as the same
-
+                        void *arg = 0);
   static int cond_signal (ACE_cond_t *cv);
   static int cond_timedwait (ACE_cond_t *cv,
                              ACE_mutex_t *m,
diff --git a/ace/OS.i b/ace/OS.i
index e754c0ea9be..cefbdcbf3f7 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -2403,11 +2403,7 @@ ACE_INLINE int
 ACE_OS::cond_init (ACE_cond_t *cv,
                    ACE_condattr_t &attributes,
                    LPCTSTR name,
-                   void *arg
-#if defined(CHORUS)
-                   , int
-#endif
-                   )
+                   void *arg)
 {
   // ACE_TRACE ("ACE_OS::cond_init");
   ACE_UNUSED_ARG (name);
@@ -2451,11 +2447,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
 {
   ACE_condattr_t attributes;
   if (ACE_OS::condattr_init (attributes, type) == 0
-      && ACE_OS::cond_init (cv, attributes, name, arg
-#if defined(CHORUS)
-                            , 0
-#endif /* CHORUS */
-                            ) == 0)
+      && ACE_OS::cond_init (cv, attributes, name, arg) == 0)
     {
       (void) ACE_OS::condattr_destroy (attributes);
       return 0;
@@ -4237,11 +4229,7 @@ ACE_OS::event_init (ACE_event_t *event,
   int result = ACE_OS::cond_init (&event->condition_,
                                   type,
                                   name,
-                                  arg
-#if defined(CHORUS)
-                                  , 0
-#endif /* CHORUS */
-                                  );
+                                  arg);
   if (result == 0)
     result = ACE_OS::mutex_init (&event->lock_,
                                  type,
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 4c74f47fe07..ff4ef5878ae 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -772,13 +772,8 @@ ACE_Condition_Thread_Mutex (const ACE_Thread_Mutex &m,
 #endif  /*  ACE_HAS_FSU_PTHREADS */
 
 // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex");
-#if defined(CHORUS)
-  if (ACE_OS::cond_init (&this->cond_, attributes.attributes_,
-                         name, arg, 0) != 0)
-#else  /* ! CHORUS */
   if (ACE_OS::cond_init (&this->cond_, attributes.attributes_,
                          name, arg) != 0)
-#endif /* ! CHORUS */
     ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex")));
 }