ChangeLogTag: Tue Jan 25 09:59:28 2005 J.T. Conklin <jtc@acorntoolworks.com>

7 files changed, 53 insertions, 68 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index b45536ee0cc..706d2fbc2ba 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -13,8 +13,7 @@ ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-  : scheduler_strategy_ (ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                                          TAO_MIN_CRITICAL_PRIORITY))
+  : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t>(TAO_MIN_CRITICAL_PRIORITY))
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
 #else
   : impl (new Scheduler_Generic)
@@ -268,7 +267,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   const char *anomaly_severity_msg = "NONE";
   CORBA::ULong anomaly_index = 0;
   CORBA::ULong anomaly_set_size =
-                    ACE_static_cast (CORBA::ULong, anomaly_set.size ());
+                    static_cast<CORBA::ULong>(anomaly_set.size ());
   if (anomalies.ptr () == 0)
     {
       anomalies =
@@ -385,7 +384,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
     }
   infos->length (impl->tasks ());
   for (RtecScheduler::handle_t handle = 1;
-       handle <= ACE_static_cast (RtecScheduler::handle_t, impl->tasks ());
+       handle <= static_cast<RtecScheduler::handle_t>(impl->tasks ());
        ++handle)
     {
       RtecScheduler::RT_Info* rt_info = 0;
@@ -414,8 +413,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   configs->length (impl->minimum_priority_queue () + 1);
   for (RtecScheduler::Preemption_Priority_t priority = 0;
        priority <=
-         ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                          impl->minimum_priority_queue ());
+         static_cast<RtecScheduler::Preemption_Priority_t>(impl->minimum_priority_queue ());
        ++priority)
     {
       RtecScheduler::Config_Info* config_info = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 86c3113f068..4ea8c847d54 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -711,7 +711,7 @@ ACE_DynScheduler::schedule (
   else
   {
     // save the total number of registered RT_Infos
-    tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
+    tasks (static_cast<u_int>(rt_info_entries_.size ()));
   }
 
   // set up the task entry data structures
@@ -1279,7 +1279,7 @@ ACE_DynScheduler::calculate_utilization_params (void)
         ACE_static_cast (double,
           ACE_UINT64_DBLCAST_ADAPTER (ordered_dispatch_entries_ [i]->
             task_entry ().rt_info ()->worst_case_execution_time)) /
-        ACE_static_cast (double, ordered_dispatch_entries_ [i]->
+        static_cast<double>(ordered_dispatch_entries_ [i]->
             task_entry ().effective_period ());
     }
   }
@@ -1317,7 +1317,7 @@ ACE_DynScheduler::status_t
 ACE_DynScheduler::setup_task_entries (void)
 {
   // store number of tasks, based on registrations
-  tasks (ACE_static_cast (u_int, rt_info_entries_.size ()));
+  tasks (static_cast<u_int>(rt_info_entries_.size ()));
 
   // bail out if there are no tasks registered
   if (tasks () <= 0)
@@ -1725,7 +1725,7 @@ ACE_DynScheduler::schedule_threads (ACE_Unbounded_Set<RtecScheduler::Scheduling_
 ACE_DynScheduler::status_t
 ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set)
 {
-  dispatch_entry_count_ = ACE_static_cast (u_int, dispatch_entries_->size ());
+  dispatch_entry_count_ = static_cast<u_int>(dispatch_entries_->size ());
 
   ACE_NEW_RETURN (ordered_dispatch_entries_,
                   Dispatch_Entry * [dispatch_entry_count_],
@@ -1870,10 +1870,10 @@ ACE_DynScheduler::create_timeline ()
       // have to change when TimeBase.idl is finalized.
       const TimeBase::TimeT arrival =
         ordered_dispatch_entries_[i]->arrival () +
-        ACE_static_cast (ACE_UINT32, current_frame_offset);
+        static_cast<ACE_UINT32>(current_frame_offset);
       const TimeBase::TimeT deadline=
         ordered_dispatch_entries_[i]->deadline () +
-        ACE_static_cast (ACE_UINT32, current_frame_offset);
+        static_cast<ACE_UINT32>(current_frame_offset);
 
       ACE_NEW_RETURN (
         new_dispatch_entry,
@@ -2331,12 +2331,8 @@ ACE_DynScheduler::output_viewer_timeline (FILE *file)
             file, "%-11s  %9f  %9f  %8u  %8u  %11u  %11u\n",
             current_entry->dispatch_entry ().task_entry ().rt_info ()->
               entry_point.in (),
-                        ACE_static_cast (
-                          double,
-                          ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) /
-                        ACE_static_cast (
-                          double,
-                          ACE_UINT64_DBLCAST_ADAPTER(current_completion)),
+                        static_cast<double>(ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) /
+                        static_cast<double>(ACE_UINT64_DBLCAST_ADAPTER(current_completion)),
             0.0,
             ACE_U64_TO_U32 (current_entry->arrival ()),
             ACE_U64_TO_U32 (current_entry->deadline ()),
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index ffcbe5908fc..8a6ae0189db 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -209,7 +209,7 @@ TAO_RT_Info_Tuple::~TAO_RT_Info_Tuple ()
 void
 TAO_RT_Info_Tuple::operator = (const RtecScheduler::RT_Info &info)
 {
-  ACE_static_cast (TAO_RT_Info_Ex, *this) = info;
+  static_cast<TAO_RT_Info_Ex>(*this) = info;
 }
 
 
@@ -955,7 +955,7 @@ TAO_Reconfig_Sched_Strategy_Base::comp_tuple_finish_times (const void *first, co
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first_tuple =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, first));
+                          const_cast<void *>(first));
 
   //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void*
   void * first_entry = ACE_LONGLONG_TO_PTR (void *,
@@ -963,7 +963,7 @@ TAO_Reconfig_Sched_Strategy_Base::comp_tuple_finish_times (const void *first, co
 
   TAO_RT_Info_Tuple **second_tuple =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, second));
+                          const_cast<void *>(second));
 
   //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void*
   void * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1109,10 +1109,10 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
   TAO_Reconfig_Scheduler_Entry **second =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1164,7 +1164,7 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1172,7 +1172,7 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
 
   TAO_RT_Info_Tuple **second =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1313,10 +1313,10 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
   TAO_Reconfig_Scheduler_Entry **second =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1371,7 +1371,7 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1379,7 +1379,7 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
 
   TAO_RT_Info_Tuple **second =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
       ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1543,10 +1543,10 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const v
   // make Sun C++ 4.2 happy.
   TAO_Reconfig_Scheduler_Entry **first =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
   TAO_Reconfig_Scheduler_Entry **second =
     ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   // Check the converted pointers.
   if (first == 0 || *first == 0)
@@ -1601,7 +1601,7 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
   // make Sun C++ 4.2 happy.
   TAO_RT_Info_Tuple **first =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, s));
+                          const_cast<void *>(s));
 
   TAO_Reconfig_Scheduler_Entry * first_entry =
     ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
@@ -1609,7 +1609,7 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_admission_comp (const void *s,
 
   TAO_RT_Info_Tuple **second =
     ACE_reinterpret_cast (TAO_RT_Info_Tuple **,
-                          ACE_const_cast (void *, t));
+                          const_cast<void *>(t));
 
   TAO_Reconfig_Scheduler_Entry * second_entry =
     ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index 1b7dca516b3..d4b767e78f4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -946,25 +946,21 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
 
   // Compute the current tuple's utilization.
   CORBA::Double delta_utilization =
-    (ACE_static_cast (CORBA::Double,
-                      t.threads)
+    (static_cast<CORBA::Double>(t.threads)
      * ACE_static_cast (CORBA::Double,
                         ACE_UINT64_DBLCAST_ADAPTER (entry->
                                                       aggregate_exec_time ())))
-    / ACE_static_cast (CORBA::Double,
-                       t.period);
+    / static_cast<CORBA::Double>(t.period);
 
   // Subtract the previous tuple's utilization (if any) for the entry.
   if (entry->current_admitted_tuple ())
     {
       delta_utilization -=
-        (ACE_static_cast (CORBA::Double,
-                          entry->current_admitted_tuple ()->threads)
+        (static_cast<CORBA::Double>(entry->current_admitted_tuple ()->threads)
          * ACE_static_cast (CORBA::Double,
                             ACE_UINT64_DBLCAST_ADAPTER (entry->
                                                           aggregate_exec_time ())))
-        / ACE_static_cast (CORBA::Double,
-                           entry->current_admitted_tuple ()->period);
+        / static_cast<CORBA::Double>(entry->current_admitted_tuple ()->period);
     }
 
   if (RECONFIG_SCHED_STRATEGY::is_critical (t))
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index dab2f3de771..b323dc764c5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -1572,7 +1572,7 @@ get_config_info_set (RtecScheduler::Config_Info_Set_out configs
        ++config_iter)
     {
       config_info = (*config_iter).int_id_;
-      configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info;
+      configs[static_cast<CORBA::ULong>(config_info->preemption_priority)] = *config_info;
     }
 
   return;
@@ -1692,7 +1692,7 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
        ++config_iter)
     {
       config_info = (*config_iter).int_id_;
-      configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info;
+      configs[static_cast<CORBA::ULong>(config_info->preemption_priority)] = *config_info;
     }
 }
 
@@ -1814,8 +1814,7 @@ create_i (const char *entry_point,
   // Connect the entry to the RT_Info.
   new_rt_info->volatile_token =
     ACE_static_cast (CORBA::ULongLong,
-                     ACE_reinterpret_cast (ptrdiff_t,
-                                           new_sched_entry));
+                     reinterpret_cast<ptrdiff_t>(new_sched_entry));
 
   // With everything safely registered in the map and tree, just
   // update the next handle and info counter and return the new info.
@@ -2510,11 +2509,10 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
   // Sort the pointers to entries in order of descending forward
   // finish times, which produces a reverse topological ordering,
   // with callers ahead of called nodes.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *>(entry_ptr_array_),
                  this->rt_info_count_,
                  sizeof (TAO_Reconfig_Scheduler_Entry *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                                       RECONFIG_SCHED_STRATEGY::comp_entry_finish_times));
+                 reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::comp_entry_finish_times));
 
   // Traverse entries in reverse topological order,
   // looking for strongly connected components (cycles).
@@ -2573,11 +2571,10 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
 
   // Sort the pointers to original tuples in ascending admission
   // order, according to the scheduling strategy's admission policy.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *>(tuple_ptr_array_),
            this->rt_info_tuple_count_,
            sizeof (TAO_RT_Info_Tuple *),
-           ACE_reinterpret_cast (COMP_FUNC,
-                                 RECONFIG_SCHED_STRATEGY::total_admission_comp));
+           reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::total_admission_comp));
 
   // Traverse tuples in admission order, updating the associate tuple
   // for each thread delineator.
@@ -2657,11 +2654,10 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
   // Sort the pointers to original tuples in ascending admission
   // order, according to the scheduling strategy's admission policy.
 
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *>(tuple_ptr_array_),
                  this->rt_info_tuple_count_,
                  sizeof (TAO_RT_Info_Tuple *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                   RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times ));
+                 reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times ));
 
   // Traverse entries in topological (ascending forward DFS
   // finish time) order, propagating aggregate execution
@@ -2762,11 +2758,10 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
   // Sort the pointers to entries in descending order
   // of static priority and static subpriority, according
   // to our given scheduling strategy.
-  ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_),
+  ACE_OS::qsort (reinterpret_cast<void *>(entry_ptr_array_),
                  this->rt_info_count_,
                  sizeof (TAO_Reconfig_Scheduler_Entry *),
-                 ACE_reinterpret_cast (COMP_FUNC,
-                                       RECONFIG_SCHED_STRATEGY::total_priority_comp));
+                 reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::total_priority_comp));
 
 #ifdef SCHEDULER_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index b6cfd9c042e..5a44a27eb68 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -228,7 +228,7 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *>
   status_t status = ACE_Scheduler::SUCCEEDED;
 
   // store number of tasks, based on registrations
-  tasks (ACE_static_cast (u_int, task_entries_.size ()));
+  tasks (static_cast<u_int>(task_entries_.size ()));
 
   if (output_level () > 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 6192a59802a..39164b0afb7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -839,8 +839,8 @@ int
 ACE_MUF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_MUF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **>(arg1),
+                      ** static_cast<Dispatch_Entry **>(arg2));
 }
 
 
@@ -975,8 +975,8 @@ int
 ACE_RMS_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_RMS_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **>(arg1),
+                      ** static_cast<Dispatch_Entry **>(arg2));
 }
 
 
@@ -1119,8 +1119,8 @@ int
 ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_MLF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **>(arg1),
+                      ** static_cast<Dispatch_Entry **>(arg2));
 }
 
 
@@ -1246,8 +1246,8 @@ int
 ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_EDF_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **>(arg1),
+                      ** static_cast<Dispatch_Entry **>(arg2));
 }
 
 // = Provides the dispatching queue type for the given dispatch entry.
@@ -1371,8 +1371,8 @@ int
 ACE_Criticality_Scheduler_Strategy::sort_function (void *arg1, void *arg2)
 {
   return ACE_Criticality_Scheduler_Strategy::instance ()->
-           sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1),
-                      ** ACE_static_cast (Dispatch_Entry **, arg2));
+           sort_comp (** static_cast<Dispatch_Entry **>(arg1),
+                      ** static_cast<Dispatch_Entry **>(arg2));
 }