ChangeLogTag: Thu Jan 4 17:14:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>

4 files changed, 39 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 84c027bd65c..c728d1db378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the
+	  code from SunCC5 builds. This piece of code was trying to set
+	  things right when it sees all the masks clear and <size_>
+	  greater than zero. This seems to be creating problems with SunCC
+	  5 builds alone. Commenting out this piece for SunCC5 helps. This
+	  should also be a work around for the bug #750 in bugzilla.
+	  
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 84c027bd65c..c728d1db378 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the
+	  code from SunCC5 builds. This piece of code was trying to set
+	  things right when it sees all the masks clear and <size_>
+	  greater than zero. This seems to be creating problems with SunCC
+	  5 builds alone. Commenting out this piece for SunCC5 helps. This
+	  should also be a work around for the bug #750 in bugzilla.
+	  
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 84c027bd65c..c728d1db378 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Thu Jan  4 17:14:33 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/TP_Reactor.cpp (dispatch_i): Eliminate a portion of the
+	  code from SunCC5 builds. This piece of code was trying to set
+	  things right when it sees all the masks clear and <size_>
+	  greater than zero. This seems to be creating problems with SunCC
+	  5 builds alone. Commenting out this piece for SunCC5 helps. This
+	  should also be a work around for the bug #750 in bugzilla.
+	  
 Thu Jan 04 17:07:48 2001  Luther Baker  <luther@cs.wustl.edu>
 
  	* ace/ace_dll.dsp
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 886e07aacec..2920adb8c97 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -40,7 +40,7 @@ ACE_TP_Reactor::owner (ACE_thread_t, ACE_thread_t *o_id)
     *o_id = ACE_Thread::self ();
 
   return 0;
-  
+
 }
 
 int
@@ -50,7 +50,7 @@ ACE_TP_Reactor::owner (ACE_thread_t *t_id)
   *t_id = ACE_Thread::self ();
 
   return 0;
-  
+
 }
 
 
@@ -205,9 +205,19 @@ ACE_TP_Reactor::dispatch_i (ACE_Time_Value *max_wait_time,
       // I don't understand...) the mask will have all of its bits clear,
       // yet have a size_ > 0. This is an attempt to remedy the affect,
       // without knowing why it happens.
+
+# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500))
+      // SunCC seems to be having problems with this piece of code
+      // here. I am  not sure why though. This works fine with other
+      // compilers. As we dont seem to understand when this piece of
+      // code is needed and as it creates problems for SunCC we will
+      // not compile this. Most of the tests in TAO seem to be happy
+      // without this in SunCC.
       this->ready_set_.rd_mask_.sync (this->ready_set_.rd_mask_.max_set ());
       this->ready_set_.wr_mask_.sync (this->ready_set_.wr_mask_.max_set ());
       this->ready_set_.ex_mask_.sync (this->ready_set_.ex_mask_.max_set ());
+# endif /* ! __SUNPRO_CC */
+
     }
 
   int active_handle_count = this->wait_for_multiple_events (this->ready_set_,