ChangeLogTag:Wed Jul 5 14:04:50 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

6 files changed, 30 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 30c2f72b9d8..dbba0bdcaaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/SUN_Proactor: Added yet another handle_events() method to keep
+	  SunC++ from complaining!  Thanks to David for reporting this.
+
 Wed Jul 05 13:19:52 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Don't typedef pid_t for ACE_PSOS_DIAB_PPC - it's defined
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 30c2f72b9d8..dbba0bdcaaa 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/SUN_Proactor: Added yet another handle_events() method to keep
+	  SunC++ from complaining!  Thanks to David for reporting this.
+
 Wed Jul 05 13:19:52 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Don't typedef pid_t for ACE_PSOS_DIAB_PPC - it's defined
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 30c2f72b9d8..dbba0bdcaaa 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Wed Jul  5 14:04:50 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/SUN_Proactor: Added yet another handle_events() method to keep
+	  SunC++ from complaining!  Thanks to David for reporting this.
+
 Wed Jul 05 13:19:52 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/OS.h: Don't typedef pid_t for ACE_PSOS_DIAB_PPC - it's defined
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index cb98a0ce5fd..6796011cc8d 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -398,7 +398,7 @@ protected:
   int mask_all (void) const;
   // To mask all the signals in a thread.
 
-  virtual int handle_events (unsigned long milli_seconds);
+  virtual int handle_events (u_long milli_seconds);
   // Dispatch a single set of events.  If <milli_seconds> elapses
   // before any events occur, return 0. Return 1 if a completion is
   // dispatched. Return -1 on errors.
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index 0aa0f6c91ed..ba0a000d765 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -34,6 +34,12 @@ ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time)
 }
 
 int
+ACE_SUN_Proactor::handle_events (void)
+{
+  return this->handle_events (ACE_INFINITE);
+}
+
+int
 ACE_SUN_Proactor::handle_events (u_long milli_seconds)
 {
   aio_result_t *result = 0;
diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h
index ad6f5aaf5ef..148b27e23ae 100644
--- a/ace/SUN_Proactor.h
+++ b/ace/SUN_Proactor.h
@@ -81,11 +81,18 @@ protected:
   // completion is dispatched, non-zero (-1) on errors and errno is
   // set accordingly.
 
-  virtual int handle_events (unsigned long milli_seconds);
+  virtual int handle_events (u_long milli_seconds);
   // Dispatch a single set of events.  If <milli_seconds> elapses
   // before any events occur, return 0. Return 1 if a completion is
   // dispatched. Return -1 on errors.
  
+  virtual int handle_events (void);
+  // Block indefinitely until at least one event is dispatched.
+  // Dispatch a single set of events.  If <wait_time> elapses before
+  // any events occur, return 0.  Return 1 on success i.e., when a
+  // completion is dispatched, non-zero (-1) on errors and errno is
+  // set accordingly.
+
   virtual int start_aio (ACE_POSIX_Asynch_Result *result, int op);
   // From ACE_POSIX_AIOCB_Proactor.