ChangeLogTag:Thu Jan 20 18:18:00 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 11 insertions, 11 deletions

diff --git a/examples/APG/Reactor/Client.cpp b/examples/APG/Reactor/Client.cpp
index b32e2b7f9d8..520b17f7ef1 100644
--- a/examples/APG/Reactor/Client.cpp
+++ b/examples/APG/Reactor/Client.cpp
@@ -32,7 +32,7 @@ int Client::handle_input (ACE_HANDLE)
   if (recv_cnt > 0)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%.*C"),
-                  ACE_static_cast (int, recv_cnt),
+                  static_cast<int> (recv_cnt),
                   buf));
       return 0;
     }
@@ -60,7 +60,7 @@ int Client::handle_timeout(const ACE_Time_Value &, const void *)
   int nbytes = ACE_OS::sprintf
     (mb->wr_ptr (), "Iteration %d\n", this->iterations_);
   ACE_ASSERT (nbytes > 0);
-  mb->wr_ptr (ACE_static_cast (size_t, nbytes));
+  mb->wr_ptr (static_cast<size_t> (nbytes));
   this->putq (mb);
   return 0;
 }
@@ -80,7 +80,7 @@ int Client::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->ungetq (mb);
diff --git a/examples/APG/Reactor/HAStatus-AC.cpp b/examples/APG/Reactor/HAStatus-AC.cpp
index f872fc612ba..24861113f85 100644
--- a/examples/APG/Reactor/HAStatus-AC.cpp
+++ b/examples/APG/Reactor/HAStatus-AC.cpp
@@ -52,7 +52,7 @@ ClientService::handle_input (ACE_HANDLE)
 
   send_cnt =
     this->peer ().send (buffer,
-                        ACE_static_cast (size_t, recv_cnt));
+                        static_cast<size_t> (recv_cnt));
   if (send_cnt == recv_cnt)
     return 0;
   if (send_cnt == -1 && ACE_OS::last_error () != EWOULDBLOCK)
@@ -64,7 +64,7 @@ ClientService::handle_input (ACE_HANDLE)
     send_cnt = 0;
   ACE_Message_Block *mb;
   size_t remaining =
-    ACE_static_cast (size_t, (recv_cnt - send_cnt));
+    static_cast<size_t> ((recv_cnt - send_cnt));
   ACE_NEW_RETURN (mb, ACE_Message_Block (remaining), -1);
   mb->copy (&buffer[send_cnt], remaining);
   int output_off = this->msg_queue ()->is_empty ();
@@ -99,7 +99,7 @@ ClientService::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->ungetq (mb);
diff --git a/examples/APG/Reactor/HAStatus.cpp b/examples/APG/Reactor/HAStatus.cpp
index 361c7806391..fb32aa61632 100644
--- a/examples/APG/Reactor/HAStatus.cpp
+++ b/examples/APG/Reactor/HAStatus.cpp
@@ -156,7 +156,7 @@ ClientService::handle_input (ACE_HANDLE)
     }
 
   send_cnt =
-    this->sock_.send (buffer, ACE_static_cast (size_t, recv_cnt));
+    this->sock_.send (buffer, static_cast<size_t> (recv_cnt));
   if (send_cnt == recv_cnt)
     return 0;
   if (send_cnt == -1 && ACE_OS::last_error () != EWOULDBLOCK)
@@ -168,7 +168,7 @@ ClientService::handle_input (ACE_HANDLE)
     send_cnt = 0;
   ACE_Message_Block *mb;
   size_t remaining =
-    ACE_static_cast (size_t, (recv_cnt - send_cnt));
+    static_cast<size_t> ((recv_cnt - send_cnt));
   ACE_NEW_RETURN (mb, ACE_Message_Block (remaining), -1);
   mb->copy (&buffer[send_cnt], remaining);
   int output_off = this->output_queue_.is_empty ();
@@ -204,7 +204,7 @@ ClientService::handle_output (ACE_HANDLE)
                     ACE_TEXT ("(%P|%t) %p\n"),
                     ACE_TEXT ("send")));
       else
-        mb->rd_ptr (ACE_static_cast (size_t, send_cnt));
+        mb->rd_ptr (static_cast<size_t> (send_cnt));
       if (mb->length () > 0)
         {
           this->output_queue_.enqueue_head (mb);
diff --git a/examples/APG/Reactor/Timer_State_Data.cpp b/examples/APG/Reactor/Timer_State_Data.cpp
index ff945553372..215381df394 100644
--- a/examples/APG/Reactor/Timer_State_Data.cpp
+++ b/examples/APG/Reactor/Timer_State_Data.cpp
@@ -64,9 +64,9 @@ public:
     time_t epoch = ((timespec_t)current_time).tv_sec;
 
     const TemperatureSensor *const_sensor =
-      ACE_reinterpret_cast (const TemperatureSensor *, arg);
+      reinterpret_cast<const TemperatureSensor *> (arg);
     TemperatureSensor *sensor =
-      ACE_const_cast (TemperatureSensor *, const_sensor);
+      const_cast<TemperatureSensor *> (const_sensor);
 
     int queryCount = sensor->querySensor ();
     this->updateAverageTemperature (sensor);