1 files changed, 17 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index e911cbc6daf..e900916243e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -17,8 +17,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_ ((RtecScheduler::Preemption_Priority_t) TAO_MIN_CRITICAL_PRIORITY)
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
 #else
   : impl (new Scheduler_Generic)
@@ -35,7 +34,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 RtecScheduler::handle_t
 ACE_Config_Scheduler::create (const char * entry_point,
                               CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
@@ -87,7 +86,7 @@ ACE_Config_Scheduler::create (const char * entry_point,
 RtecScheduler::handle_t
 ACE_Config_Scheduler::lookup (const char * entry_point,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    TAO_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->get_rt_info (entry_point, rt_info))
@@ -109,7 +108,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info*
 ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
                            CORBA::Environment &)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -145,7 +144,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 CORBA::Long threads,
                                 RtecScheduler::Info_Type_t info_type,
                                 CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -177,7 +176,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -196,7 +195,7 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                                  CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
@@ -211,7 +210,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type,
                                            CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
@@ -249,7 +248,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                                CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
@@ -271,7 +270,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   // anomaly severity.
   RtecScheduler::Anomaly_Severity severity = RtecScheduler::ANOMALY_NONE;
   RtecScheduler::Scheduling_Anomaly **anomaly = 0;
-  const char *anomaly_severity_msg = "NONE";
+  char *anomaly_severity_msg = "NONE";
   CORBA::ULong anomaly_index = 0;
   if (anomalies.ptr () == 0)
     {
@@ -328,7 +327,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         ACE_DEBUG ((LM_DEBUG,
                     "%s: %s\n",
                     anomaly_severity_msg,
-                    (*anomaly)->description.in ()));
+                    (const char*) ((*anomaly)->description)));
 
         // Store the anomaly in the anomaly sequence out parameter
         anomalies[anomaly_index] = **anomaly;
@@ -383,11 +382,11 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   // return the set of scheduled RT_Infos
   if (infos.ptr () == 0)
     {
-      infos = new RtecScheduler::RT_Info_Set (impl->tasks ());
+      infos = new RtecScheduler::RT_Info_Set(impl->tasks ());
     }
   infos->length (impl->tasks ());
   for (RtecScheduler::handle_t handle = 1;
-       handle <= ACE_static_cast (RtecScheduler::handle_t, impl->tasks ());
+       handle <= (RtecScheduler::handle_t) impl->tasks ();
        ++handle)
     {
       RtecScheduler::RT_Info* rt_info = 0;
@@ -395,7 +394,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         {
         case BaseSchedImplType::SUCCEEDED:
           // We know that handles start at 1.
-          infos[ACE_static_cast (CORBA::ULong, handle - 1)] = *rt_info;
+          infos[CORBA::ULong(handle - 1)] = *rt_info;
           break;
         case BaseSchedImplType::FAILED:
         case BaseSchedImplType::ST_UNKNOWN_TASK:
@@ -416,8 +415,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 ());
+         (RtecScheduler::Preemption_Priority_t) impl->minimum_priority_queue ();
        ++priority)
     {
       RtecScheduler::Config_Info* config_info = 0;
@@ -450,7 +448,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type,
                                                    CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
@@ -469,7 +467,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 RtecScheduler::Preemption_Priority_t
 ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);