ChangeLogTag: Fri Jan 28 07:18:10 2005 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 10 insertions, 12 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 6edf35c7424..389f51d958d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -111,7 +111,7 @@ main (int argc, char **argv)
               "\n \t IDL_Cubit: Collocation test \n\n"));
 
   ACE_Thread_Manager tm;
-  tm.spawn (ACE_reinterpret_cast (ACE_THR_FUNC, &svr_worker),
+  tm.spawn (reinterpret_cast<ACE_THR_FUNC> (&svr_worker),
             &thread_barrier);
   thread_barrier.server_init_.wait ();
   ACE_OS::sleep (1);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 0f79cc7403b..876035b66dc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -19,7 +19,7 @@ ACE_round (ACE_timer_t t)
 #if defined (ACE_LACKS_FLOATING_POINT)
   return t;
 #else
-  return ACE_static_cast (ACE_UINT32, t);
+  return static_cast<ACE_UINT32> (t);
 #endif
 }
 
@@ -339,8 +339,7 @@ Client::get_low_priority_latency (void)
 ACE_timer_t
 Client::get_latency (u_int thread_id)
 {
-  return ACE_static_cast (ACE_timer_t,
-                          this->ts_->latency_ [thread_id]);
+  return static_cast<ACE_timer_t> (this->ts_->latency_ [thread_id]);
 }
 
 // Returns the jitter in usecs.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index a82e1be5dee..90424b14d83 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -183,8 +183,8 @@ Server::activate_high_servant (void)
 
   char *high_second_argv[] =
     {orbendpoint,
-     ACE_const_cast (char *, "-ORBSndSock 32768 "),
-     ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+     const_cast<char *> ("-ORBSndSock 32768 "),
+     const_cast<char *> ("-ORBRcvSock 32768 "),
      0};
   ACE_NEW_RETURN (this->high_argv_,
                   ACE_ARGV (this->argv_, high_second_argv),
@@ -227,7 +227,7 @@ Server::activate_high_servant (void)
 int
 Server::activate_low_servants (void)
 {
-  if (ACE_static_cast (int, this->num_low_priority_) > 0)
+  if (static_cast<int> (this->num_low_priority_) > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Creating %d servants starting at priority %d\n",
@@ -271,8 +271,8 @@ Server::activate_low_servants (void)
     {
       char *low_second_argv[] =
         {random_endpoint,
-         ACE_const_cast (char *, "-ORBSndSock 32768 "),
-         ACE_const_cast (char *, "-ORBRcvSock 32768 "),
+         const_cast<char *> ("-ORBSndSock 32768 "),
+         const_cast<char *> ("-ORBRcvSock 32768 "),
          0};
       ACE_NEW_RETURN (this->low_argv_,
                       ACE_ARGV (this->argv_,
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index a0c3544bc95..c3a276474ba 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -87,7 +87,7 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 'i':
-        iterations = ACE_static_cast (u_long, ACE_OS::atoi (get_opts.opt_arg ()));
+        iterations = static_cast<u_long> (ACE_OS::atoi (get_opts.opt_arg ()));
         break;
 
       case 'r':
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 04599b0790f..3981c21c94e 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -216,8 +216,7 @@ to_seconds (ACE_UINT64 hrtime,
 #if defined ACE_LACKS_LONGLONG_T
     hrtime / sf;
 #else  /* ! ACE_LACKS_LONGLONG_T */
-  ACE_static_cast (double,
-                   ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
+  static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (hrtime / sf));
 #endif /* ! ACE_LACKS_LONGLONG_T */
   seconds /= ACE_HR_SCALE_CONVERSION;