diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-07-03 20:44:03 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-07-03 20:44:03 +0000 |
| commit | c36a729e5ea2409d1ef6344c45699cc1d95a7ab9 (patch) | |
| tree | 48a52b152d239a6e06244593d9e39a3ab2f7bec4 | |
| parent | 334d172f163694ca70822249074115fe3b6ad789 (diff) | |
| download | ATCD-c36a729e5ea2409d1ef6344c45699cc1d95a7ab9.tar.gz | |
ChangeLogTag: Tue Jul 3 15:43:25 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 4 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 4 | ||||
| -rw-r--r-- | ace/Select_Reactor_Base.cpp | 19 |
4 files changed, 22 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index d0cbae18480..a843da3606f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 3 15:43:25 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Select_Reactor_Base.cpp: Fixed a warning in g++. + Tue Jul 3 14:44:00 2001 Craig Rodrigues <crodrigues@bbn.com> * ace/config-win32-common.h: Borland C++ apparently diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d0cbae18480..a843da3606f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,7 @@ +Tue Jul 3 15:43:25 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Select_Reactor_Base.cpp: Fixed a warning in g++. + Tue Jul 3 14:44:00 2001 Craig Rodrigues <crodrigues@bbn.com> * ace/config-win32-common.h: Borland C++ apparently diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d0cbae18480..a843da3606f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,7 @@ +Tue Jul 3 15:43:25 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Select_Reactor_Base.cpp: Fixed a warning in g++. + Tue Jul 3 14:44:00 2001 Craig Rodrigues <crodrigues@bbn.com> * ace/config-win32-common.h: Borland C++ apparently diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp index d4291a0d280..3867d40b3bb 100644 --- a/ace/Select_Reactor_Base.cpp +++ b/ace/Select_Reactor_Base.cpp @@ -480,7 +480,7 @@ ACE_Select_Reactor_Notify::max_notify_iterations (void) // ACE_NOTSUP_RETURN if ACE_HAS_REACTOR_NOTIFICATION_QUEUE is not defined. int ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask mask) + ACE_Reactor_Mask mask ) { ACE_TRACE ("ACE_Select_Reactor_Notify::purge_pending_notifications"); @@ -563,6 +563,7 @@ ACE_Select_Reactor_Notify::purge_pending_notifications (ACE_Event_Handler *eh, #else /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ ACE_UNUSED_ARG (eh); + ACE_UNUSED_ARG (mask); ACE_NOTSUP_RETURN (-1); #endif /* defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) */ } @@ -587,7 +588,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r, if (disable_notify_pipe == 0) { - this->select_reactor_ = + this->select_reactor_ = ACE_dynamic_cast (ACE_Select_Reactor_Impl *, r); if (select_reactor_ == 0) @@ -605,7 +606,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r, #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) ACE_Notification_Buffer *temp; - + ACE_NEW_RETURN (temp, ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], -1); @@ -682,16 +683,16 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *eh, ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->notify_queue_lock_, -1); // No pending notifications. - if (this->notify_queue_.is_empty ()) + if (this->notify_queue_.is_empty ()) notification_required = 1; ACE_Notification_Buffer *temp = 0; - if (free_queue_.dequeue_head (temp) == -1) + if (free_queue_.dequeue_head (temp) == -1) { // Grow the queue of available buffers. ACE_Notification_Buffer *temp1; - + ACE_NEW_RETURN (temp1, ACE_Notification_Buffer[ACE_REACTOR_NOTIFICATION_ARRAY_SIZE], -1); @@ -702,11 +703,11 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *eh, // Start at 1 and enqueue only // (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE - 1) elements since // the first one will be used right now. - for (size_t i = 1; - i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; + for (size_t i = 1; + i < ACE_REACTOR_NOTIFICATION_ARRAY_SIZE; i++) this->free_queue_.enqueue_head (temp1 + i); - + temp = temp1; } |