diff options
| -rw-r--r-- | TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp | 53 |
1 files changed, 13 insertions, 40 deletions
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index bd4877561d0..3c1f7c36bf1 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -16,10 +16,10 @@ ACE_RCSID(Sched_Conf, Sched_Conf, "$Id$") const char* service_name = "ScheduleService"; const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " - "(RtecScheduler::Criticality) %d, " - "(RtecScheduler::Importance) %d, " + "(RtecScheduler::Criticality_t) %d, " + "(RtecScheduler::Importance_t) %d, " "%d, %d, %3d, %d, %d, " - "(RtecScheduler::Info_Type) %d}\n"; + "(RtecScheduler::Info_Type_t) %d}\n"; int parse_args (int argc, char *argv []) @@ -339,17 +339,17 @@ main (int argc, char *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (TAO_TRY_ENV); TAO_CHECK_ENV; - + // Initialize the naming services TAO_Naming_Client my_name_client; if (my_name_client.init (orb.in ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize " - "the TAO_Naming_Client. \n"), - -1); - + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to initialize " + "the TAO_Naming_Client. \n"), + -1); + if (ACE_Scheduler_Factory::use_config (my_name_client.get_context (), - service_name) < 0) + service_name) < 0) { ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to bind to the scheduling service.\n"), @@ -367,15 +367,15 @@ main (int argc, char *argv[]) // initialize the RT_Info ACE_Scheduler_Factory::server ()-> set (config_infos[i].handle, - (RtecScheduler::Criticality) config_infos[i].criticality, + ACE_static_cast (RtecScheduler::Criticality_t, config_infos[i].criticality), config_infos[i].worst_case_execution_time, config_infos[i].typical_execution_time, config_infos[i].cached_execution_time, config_infos[i].period, - (RtecScheduler::Importance) config_infos[i].importance, + ACE_static_cast (RtecScheduler::Importance_t, config_infos[i].importance), config_infos[i].quantum, config_infos[i].threads, - (RtecScheduler::Info_Type) config_infos[i].info_type, + ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type), TAO_TRY_ENV); // make operations in second half dependant on @@ -441,30 +441,3 @@ main (int argc, char *argv[]) return 0; } - - - - - - - - - - - - - - - - - - - - - - - - - - - |