1 files changed, 26 insertions, 28 deletions

diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index 23b8bff9afc..1eb5a17d79d 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -64,7 +64,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready_i
 {
   ACE_TRACE ("ACE_Select_Reactor_T::any_ready_i");
 
-  int number_ready = this->ready_set_.rd_mask_.num_set ()
+  int const number_ready = this->ready_set_.rd_mask_.num_set ()
     + this->ready_set_.wr_mask_.num_set ()
     + this->ready_set_.ex_mask_.num_set ();
 
@@ -117,7 +117,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t tid,
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
 
   if (o_id)
-    *o_id = this->owner_;
+    {
+      *o_id = this->owner_;
+    }
 
   this->owner_ = tid;
 
@@ -133,18 +135,18 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t *t_id)
   return 0;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> int
+template <class ACE_SELECT_REACTOR_TOKEN> bool
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false));
   return this->restart_;
 }
 
-template <class ACE_SELECT_REACTOR_TOKEN> int
-ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (int r)
+template <class ACE_SELECT_REACTOR_TOKEN> bool
+ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::restart (bool r)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
-  int const current_value = this->restart_;
+  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false));
+  bool const current_value = this->restart_;
   this->restart_ = r;
   return current_value;
 }
@@ -367,7 +369,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ready_ops
 template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open
   (size_t size,
-   int restart,
+   bool restart,
    ACE_Sig_Handler *sh,
    ACE_Timer_Queue *tq,
    int disable_notify_pipe,
@@ -444,8 +446,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::set_sig_handler
   (ACE_Sig_Handler *signal_handler)
 {
-  if (this->delete_signal_handler_)
-    delete this->signal_handler_;
+  delete this->signal_handler_;
   this->signal_handler_ = signal_handler;
   this->delete_signal_handler_ = false;
   return 0;
@@ -461,8 +462,7 @@ template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue
   (ACE_Timer_Queue *tq)
 {
-  if (this->delete_timer_queue_)
-    delete this->timer_queue_;
+  delete this->timer_queue_;
   this->timer_queue_ = tq;
   this->delete_timer_queue_ = false;
   return 0;
@@ -522,7 +522,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
 template <class ACE_SELECT_REACTOR_TOKEN>
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
   (size_t size,
-   int rs,
+   bool restart,
    ACE_Sig_Handler *sh,
    ACE_Timer_Queue *tq,
    int disable_notify_pipe,
@@ -538,7 +538,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T
 
   this->token_.reactor (*this);
   if (this->open (size,
-                  rs,
+                  restart,
                   sh,
                   tq,
                   disable_notify_pipe,
@@ -741,7 +741,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::reset_timer_interval
   ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
 
   if (0 != this->timer_queue_)
-    return this->timer_queue_->reset_interval (timer_id, interval);
+    {
+      return this->timer_queue_->reset_interval (timer_id, interval);
+    }
 
   errno = ESHUTDOWN;
   return -1;
@@ -809,7 +811,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::notify_handle
       event_handler->add_reference ();
     }
 
-  int status = (event_handler->*ptmf) (handle);
+  int const status = (event_handler->*ptmf) (handle);
 
   if (status < 0)
     this->remove_handler_i (handle, mask);
@@ -846,13 +848,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::mask_ops
   // <wait_set_>, otherwise set the <suspend_set_>.
 
   if (this->is_suspended_i (handle))
-    return this->bit_ops (handle, mask,
-                          this->suspend_set_,
-                          ops);
+    return this->bit_ops (handle, mask, this->suspend_set_, ops);
   else
-    return this->bit_ops (handle, mask,
-                          this->wait_set_,
-                          ops);
+    return this->bit_ops (handle, mask, this->wait_set_, ops);
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> ACE_Event_Handler *
@@ -861,11 +859,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::find_handler_i
 {
   ACE_TRACE ("ACE_Select_Reactor_T::find_handler_i");
 
-  ACE_Event_Handler *event_handler =
-    this->handler_rep_.find (handle);
+  ACE_Event_Handler *event_handler = this->handler_rep_.find (handle);
 
   if (event_handler)
-    event_handler->add_reference ();
+    {
+      event_handler->add_reference ();
+    }
 
   return event_handler;
 }
@@ -879,8 +878,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i
    ACE_Event_Handler **eh)
 {
   ACE_TRACE ("ACE_Select_Reactor_T::handler_i");
-  ACE_Event_Handler *event_handler =
-    this->handler_rep_.find (handle);
+  ACE_Event_Handler *event_handler = this->handler_rep_.find (handle);
 
   if (event_handler == 0)
     return -1;