diff options
68 files changed, 678 insertions, 602 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 08bd441c625..b7e37604f4a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,78 @@ +Tue Aug 30 14:23:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp + * examples/RTCORBA/Activity/Activity.cpp + * examples/RTCORBA/Activity/Task_Stats.cpp + * orbsvcs/Concurrency_Service/Concurrency_Service.cpp + * orbsvcs/Event_Service/Event_Service.cpp + * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp + * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp + * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp + P orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp + P orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp + P orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp + * orbsvcs/Naming_Service/Naming_Server.cpp + * orbsvcs/Naming_Service/Naming_Service.cpp + * orbsvcs/Notify_Service/Notify_Server.cpp + * orbsvcs/Notify_Service/Notify_Service.cpp + * orbsvcs/Scheduling_Service/Scheduling_Service.cpp + * orbsvcs/Time_Service/Clerk_i.cpp + * orbsvcs/Time_Service/Server_i.cpp + * orbsvcs/Trading_Service/Trading_Service.cpp + * orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp + * orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp + * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp + * orbsvcs/orbsvcs/Scheduler_Factory.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp + * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp + * orbsvcs/orbsvcs/Naming/Naming_Server.cpp + * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp + * orbsvcs/orbsvcs/Sched/DynSched.cpp + * orbsvcs/orbsvcs/Sched/Scheduler.cpp + * orbsvcs/orbsvcs/Trader/Trader.cpp + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp + * orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp + * orbsvcs/tests/FtRtEvent/consumer.cpp + * orbsvcs/tests/FtRtEvent/supplier.cpp + * orbsvcs/tests/Notify/Destroy/main.cpp + * orbsvcs/tests/Notify/Driver/main.cpp + * orbsvcs/tests/Notify/lib/Activation_Manager.cpp + * orbsvcs/tests/Notify/lib/Command.cpp + * orbsvcs/tests/Notify/lib/Driver.cpp + * orbsvcs/tests/Redundant_Naming/client.cpp + * tao/CORBALOC_Parser.cpp + * tao/IIOP_Connection_Handler.cpp + * tao/IIOP_Profile.cpp + * tao/MCAST_Parser.cpp + * tao/ORB_Core.cpp + * tao/default_client.cpp + * tests/MProfile_Connection_Timeout/client.cpp + Replaced ACE_LIB_TEXT with ACE_TEXT. ACE_LIB_TEXT is only for in the + ACE lib itself. + Tue Aug 30 14:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 47006f901e0..94855d88c07 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -340,8 +340,8 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request : ") - ACE_LIB_TEXT ("about to call scheduler to inform block\n") + ACE_TEXT ("(%t|%T): send_request : ") + ACE_TEXT ("about to call scheduler to inform block\n") )); #endif @@ -354,7 +354,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request interceptor done\n"))); + ACE_TEXT ("(%t|%T): send_request interceptor done\n"))); #endif DSUI_EVENT_LOG (EDF_SCHED_FAM, LEAVE_CLIENT_SCHED_TIME, int_guid, 0, NULL); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index b783adb7fbe..2768bc90151 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -350,8 +350,8 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request : ") - ACE_LIB_TEXT ("about to call scheduler to inform block\n") + ACE_TEXT ("(%t|%T): send_request : ") + ACE_TEXT ("about to call scheduler to inform block\n") )); #endif @@ -360,7 +360,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request interceptor done\n"))); + ACE_TEXT ("(%t|%T): send_request interceptor done\n"))); #endif } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 4a310640d35..148cefcbc6f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -333,8 +333,8 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request : ") - ACE_LIB_TEXT ("about to call scheduler to inform block\n") + ACE_TEXT ("(%t|%T): send_request : ") + ACE_TEXT ("about to call scheduler to inform block\n") )); #endif @@ -343,7 +343,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request interceptor done\n"))); + ACE_TEXT ("(%t|%T): send_request interceptor done\n"))); #endif } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 51871ca350c..642bb61d6c3 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -348,8 +348,8 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request : ") - ACE_LIB_TEXT ("about to call scheduler to inform block\n") + ACE_TEXT ("(%t|%T): send_request : ") + ACE_TEXT ("about to call scheduler to inform block\n") )); #endif @@ -358,7 +358,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t|%T): send_request interceptor done\n"))); + ACE_TEXT ("(%t|%T): send_request interceptor done\n"))); #endif } diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index d163c8686f6..473488b903e 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -408,9 +408,9 @@ Activity::create_started_flag_file (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Started_Flag")))) + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag")))) { - FILE *file = ACE_OS::fopen (current_arg, ACE_LIB_TEXT("w")); + FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w")); if (file == 0) ACE_ERROR ((LM_ERROR, diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index 864cd5b8465..603e93b7c9b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -104,7 +104,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) if (this->samples_count_ == 0u) { ACE_OS::sprintf (out_msg, - ACE_LIB_TEXT ("# no data collected\n")); + ACE_TEXT ("# no data collected\n")); return; } @@ -141,7 +141,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_); ACE_OS::sprintf(out_msg, - ACE_LIB_TEXT ("#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"), + ACE_TEXT ("#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"), l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, @@ -157,7 +157,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) double tmax = ACE_CU64_TO_CU32 (this->time_inv_[samples_count_-1])/sf; ACE_OS::sprintf(out_msg, - ACE_LIB_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %.0f, last invocation time = %.0f\n"), + ACE_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %.0f, last invocation time = %.0f\n"), l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, @@ -166,13 +166,13 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) ACE_OS::sprintf(out_msg, - ACE_LIB_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), + ACE_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, l_dev); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("#latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), l_min, this->exec_time_min_at_, l_avg, l_max, this->exec_time_max_at_, diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 6b4de8fcb05..a3245dae921 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -36,7 +36,7 @@ Concurrency_Service::Concurrency_Service (void) pid_file_name_ (0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); + ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); } // Constructor taking command-line arguments. @@ -46,7 +46,7 @@ Concurrency_Service::Concurrency_Service (int argc, ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Concurrency_Service::Concurrency_Service (...)\n"))); + ACE_TEXT("Concurrency_Service::Concurrency_Service (...)\n"))); this->init (argc, argv ACE_ENV_ARG_PARAMETER); } @@ -54,9 +54,9 @@ int Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Concurrency_Service::parse_args\n"))); + ACE_TEXT("Concurrency_Service::parse_args\n"))); - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("do:p:s")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:p:s")); int c; while ((c = get_opts ()) != -1) @@ -76,10 +76,10 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("usage: %s") - ACE_LIB_TEXT(" [-d]") - ACE_LIB_TEXT(" [-o] <ior_output_file>") - ACE_LIB_TEXT("\n"), + ACE_TEXT("usage: %s") + ACE_TEXT(" [-d]") + ACE_TEXT(" [-o] <ior_output_file>") + ACE_TEXT("\n"), argv[0]), 1); } @@ -105,14 +105,14 @@ Concurrency_Service::init (int argc, "child_poa" ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("init_child_poa")), + ACE_TEXT("%p\n"), + ACE_TEXT("init_child_poa")), -1); ACE_CHECK_RETURN (-1); if (this->parse_args (command_line.get_argc(), command_line.get_TCHAR_argv())!=0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Could not parse command line\n")), + ACE_TEXT("Could not parse command line\n")), -1); CORBA::String_var str = this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory () @@ -123,7 +123,7 @@ Concurrency_Service::init (int argc, if (this->ior_file_name_ != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -138,7 +138,7 @@ Concurrency_Service::init (int argc, if (this->pid_file_name_ != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp index c6c73b667ab..cf818e1d72e 100644 --- a/TAO/orbsvcs/Event_Service/Event_Service.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp @@ -248,7 +248,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) { FILE *output_file= ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->ior_file_name_.c_str()), - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -262,7 +262,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) { FILE *pidf = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->pid_file_name_.c_str()), - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -273,7 +273,8 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("The EC IOR is <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); + ACE_TEXT("The EC IOR is <%s>\n"), + ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); CosNaming::Name channel_name (1); channel_name.length (1); @@ -282,7 +283,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[]) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("%s; running event service\n"), + ACE_TEXT("%s; running event service\n"), ACE_TEXT_CHAR_TO_TCHAR(__FILE__))); this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -313,7 +314,7 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) // default values... this->service_name_ = "EventService"; - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:s:q:b")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:s:q:b")); int opt; while ((opt = get_opt ()) != EOF) @@ -345,23 +346,23 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) // argument, but this is consistent with the EC_Multiple // test and also allows for a runtime scheduling service. - if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT("global")) == 0) + if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("global")) == 0) { this->scheduler_type_ = ES_SCHED_GLOBAL; } - else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT("local")) == 0) + else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("local")) == 0) { this->scheduler_type_ = ES_SCHED_LOCAL; } - else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT("none")) == 0) + else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("none")) == 0) { this->scheduler_type_ = ES_SCHED_NONE; } else { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Unknown scheduling type <%s> ") - ACE_LIB_TEXT("defaulting to none\n"), + ACE_TEXT("Unknown scheduling type <%s> ") + ACE_TEXT("defaulting to none\n"), get_opt.opt_arg ())); this->scheduler_type_ = ES_SCHED_NONE; } @@ -370,14 +371,14 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv []) case '?': default: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Usage: %s ") - ACE_LIB_TEXT("-n service_name ") - ACE_LIB_TEXT("-o ior_file_name ") - ACE_LIB_TEXT("-p pid_file_name ") - ACE_LIB_TEXT("-s <global|local|none> ") - ACE_LIB_TEXT("-q servant_name for persistent IOR ") - ACE_LIB_TEXT("-b use bidir giop ") - ACE_LIB_TEXT("\n"), + ACE_TEXT("Usage: %s ") + ACE_TEXT("-n service_name ") + ACE_TEXT("-o ior_file_name ") + ACE_TEXT("-p pid_file_name ") + ACE_TEXT("-s <global|local|none> ") + ACE_TEXT("-q servant_name for persistent IOR ") + ACE_TEXT("-b use bidir giop ") + ACE_TEXT("\n"), argv[0])); return -1; } diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 0f9a9e63104..add3c0f5153 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -143,7 +143,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) if (n_threads) this->num_threads_ = ACE_OS::atoi(n_threads); - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("d:jn:ps:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("d:jn:ps:")); int opt; while ((opt = get_opt ()) != EOF) @@ -167,19 +167,19 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) // argument, but this is consistent with the EC_Multiple // test and also allows for a runtime scheduling service. - if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT("global")) == 0) + if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("global")) == 0) { this->global_scheduler_ = 1; } - else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT("local")) == 0) + else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("local")) == 0) { this->global_scheduler_ = 0; } else { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Unknown scheduling type <%s> ") - ACE_LIB_TEXT("defaulting to local\n"), + ACE_TEXT("Unknown scheduling type <%s> ") + ACE_TEXT("defaulting to local\n"), get_opt.opt_arg ())); this->global_scheduler_ = 0; } @@ -188,11 +188,11 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) case '?': default: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Usage: %s \n") - ACE_LIB_TEXT(" -j join the object group\n") - ACE_LIB_TEXT(" -p set as primary\n") - ACE_LIB_TEXT(" -s <global|local> \n") - ACE_LIB_TEXT("\n"), + ACE_TEXT("Usage: %s \n") + ACE_TEXT(" -j join the object group\n") + ACE_TEXT(" -p set as primary\n") + ACE_TEXT(" -s <global|local> \n") + ACE_TEXT("\n"), argv[0])); return -1; } diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 06ecb22ba0d..e2189bb34db 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -15,7 +15,7 @@ namespace { int parse_args(int argc, char* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("i:k:o:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:k:o:")); int opt; int result = 0; @@ -41,11 +41,11 @@ int parse_args(int argc, char* argv[]) if (result == -1 || (id.length() == 0 && output.length() == 0)) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Usage: %s \n") - ACE_LIB_TEXT(" [-i id] set the id that is used to register to the naming service\n") - ACE_LIB_TEXT(" [-k kind] set the kind that is used to register to the naming service\n") - ACE_LIB_TEXT(" [-o filename] set the output file name for the IOR\n") - ACE_LIB_TEXT("\n"), + ACE_TEXT("Usage: %s \n") + ACE_TEXT(" [-i id] set the id that is used to register to the naming service\n") + ACE_TEXT(" [-k kind] set the kind that is used to register to the naming service\n") + ACE_TEXT(" [-o filename] set the output file name for the IOR\n") + ACE_TEXT("\n"), argv[0])); return -1; } @@ -126,7 +126,7 @@ int main(int argc, ACE_TCHAR* argv[]) { FILE *output_file= ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(output.c_str()), - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 18edb1a1c48..e431da580ae 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -24,7 +24,7 @@ namespace { int parse_args(int argc, ACE_TCHAR** argv) { ACE_TRY_NEW_ENV { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("i:n:o:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:n:o:")); int opt; CosNaming::Name name(1); name.length(1); @@ -116,7 +116,7 @@ int main(int argc, ACE_TCHAR** argv) FILE *output_file= ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()), - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index 3e25082579f..0a3c9a68cf8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -18,8 +18,8 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_main.h" -ACE_RCSID (LifeCycle_Service, - LifeCycle_Service, +ACE_RCSID (LifeCycle_Service, + LifeCycle_Service, "$Id$") Life_Cycle_Service_Server::Life_Cycle_Service_Server (void) @@ -62,8 +62,8 @@ Life_Cycle_Service_Server::init (int argc, if (retval == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("init")), + ACE_TEXT("%p\n"), + ACE_TEXT("init")), -1); // Activate the POA manager @@ -95,7 +95,7 @@ Life_Cycle_Service_Server::init (int argc, { if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("LifeCycle_Service: Trying to get a reference to the Naming Service.\n"))); + ACE_TEXT("LifeCycle_Service: Trying to get a reference to the Naming Service.\n"))); // Get the Naming Service object reference. CORBA::Object_var namingObj_var = @@ -118,7 +118,7 @@ Life_Cycle_Service_Server::init (int argc, if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("LifeCycle_Service: Have a proper reference to the Naming Service.\n"))); + ACE_TEXT("LifeCycle_Service: Have a proper reference to the Naming Service.\n"))); CosNaming::Name life_Cycle_Service_Name (1); life_Cycle_Service_Name.length (1); @@ -134,7 +134,7 @@ Life_Cycle_Service_Server::init (int argc, if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("LifeCycle_Service: Bound the LifeCycle Service to the Naming Context.\n"))); + ACE_TEXT("LifeCycle_Service: Bound the LifeCycle Service to the Naming Context.\n"))); } ACE_CATCHANY { @@ -151,7 +151,7 @@ Life_Cycle_Service_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("\nLifeCycle Service: Life_Cycle_Service_Server is running\n"))); + ACE_TEXT("\nLifeCycle Service: Life_Cycle_Service_Server is running\n"))); orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -166,7 +166,7 @@ u_int Life_Cycle_Service_Server::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("?d:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("?d:")); int opt; int exit_code = 0; @@ -183,10 +183,10 @@ Life_Cycle_Service_Server::parse_args (int argc, argv[0], char(opt))); case '?': ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("usage: %s") - ACE_LIB_TEXT(" [-d] <debug level> - Set the debug level\n") - ACE_LIB_TEXT(" [-?] - Prints this message\n") - ACE_LIB_TEXT("\n"), + ACE_TEXT("usage: %s") + ACE_TEXT(" [-d] <debug level> - Set the debug level\n") + ACE_TEXT(" [-?] - Prints this message\n") + ACE_TEXT("\n"), argv[0])); ACE_OS::exit (exit_code); break; diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 883b10c8b03..e782bb204f7 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -56,7 +56,7 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv [] int Basic_Logging_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:t:x")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; while ((opt = get_opt ()) != EOF) @@ -142,7 +142,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) if (ior_file_name_ != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -156,7 +156,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) if (pid_file_name_ != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index e97cc755572..be47a102d7c 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -57,7 +57,7 @@ Event_Logging_Service::init_ORB (int& argc, char *argv [] int Event_Logging_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:t:x")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; while ((opt = get_opt ()) != EOF) @@ -147,7 +147,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) if (ior_file_name_ != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -161,7 +161,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) if (pid_file_name_ != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 6a5dfd67b6c..fd898bddc31 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -73,7 +73,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv [] int Notify_Logging_Service::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:t::x")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t::x")); int opt; while ((opt = get_opt ()) != EOF) @@ -169,7 +169,7 @@ Notify_Logging_Service::init (int argc, char *argv[] if (ior_file_name_ != 0) { - FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w")); + FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -184,7 +184,7 @@ Notify_Logging_Service::init (int argc, char *argv[] if (pid_file_name_ != 0) { - FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w")); + FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp index 168a11289c7..8b86409fafe 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp @@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (naming_service.init (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Failed to start the Naming Service.\n")), + ACE_TEXT("Failed to start the Naming Service.\n")), 1); ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 1d57246d2f1..22e055649e3 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -70,7 +70,7 @@ int TAO_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("-t:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp index d28633e6d52..9391659c628 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp @@ -27,7 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Failed to initialize the Notification Service.\n")), + ACE_TEXT("Failed to initialize the Notification Service.\n")), 1); notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -36,7 +36,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("Failed to run the Notification Service\n")); + ACE_TEXT("Failed to run the Notification Service\n")); return 1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 7563f69ed85..5fe0b202b60 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -318,66 +318,66 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) const ACE_TCHAR* current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Factory")))) + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory")))) { this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg)); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-Boot")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Boot")) == 0) { this->bootstrap_ = 1; // Make it bootstrappable arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-NameSvc")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-NameSvc")) == 0) { this->use_name_svc_ = 1; // Register ref with the name service arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-NoNameSvc")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-NoNameSvc")) == 0) { this->use_name_svc_ = 0; // Don't Register ref with the name service arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-IORoutput")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) { - this->ior_output_file_ = ACE_OS::fopen (current_arg, ACE_LIB_TEXT("w")); + this->ior_output_file_ = ACE_OS::fopen (current_arg, ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", current_arg), -1); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-ChannelName")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) { this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-Channel")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Channel")) == 0) { this->register_event_channel_ = 1; // Register one EC with naming. arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Notify_TPReactor")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor")))) { ACE_DEBUG((LM_DEBUG, "-Notify_TPReactor option is deprecated, use -ORBRunThreads option\n")); this->nthreads_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-ORBRunThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads")))) { this->nthreads_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-?")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0) { ACE_DEBUG((LM_DEBUG, "usage: %s -Factory factory_name " diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp index 5f933987075..222b4e969da 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp @@ -10,8 +10,8 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (Scheduling_Service, - Scheduling_Service, +ACE_RCSID (Scheduling_Service, + Scheduling_Service, "$Id$") // Default Constructor. @@ -128,7 +128,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("The scheduler IOR is <%s>\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ()))); // Register the servant with the Naming Context.... @@ -144,7 +144,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) if (iorf != 0) { ACE_OS::fprintf (iorf, - ACE_LIB_TEXT("%s\n"), + ACE_TEXT("%s\n"), ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())); ACE_OS::fclose (iorf); } @@ -156,7 +156,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[]) if (pidf != 0) { ACE_OS::fprintf (pidf, - ACE_LIB_TEXT("%ld\n"), + ACE_TEXT("%ld\n"), static_cast<long> (ACE_OS::getpid ())); ACE_OS::fclose (pidf); } @@ -188,7 +188,7 @@ TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL) int TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:p:o:s:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:p:o:s:")); int opt; while ((opt = get_opt ()) != EOF) @@ -213,11 +213,11 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[]) (__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) case 's': - if (ACE_OS::strcasecmp (ACE_LIB_TEXT("CONFIG"), get_opt.optarg) == 0) + if (ACE_OS::strcasecmp (ACE_TEXT("CONFIG"), get_opt.optarg) == 0) { this->scheduler_type_ = CONFIG; } - else if (ACE_OS::strcasecmp (ACE_LIB_TEXT("RECONFIG"), get_opt.optarg) == 0) + else if (ACE_OS::strcasecmp (ACE_TEXT("RECONFIG"), get_opt.optarg) == 0) { this->scheduler_type_ = RECONFIG; } diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index 14eeb987ad4..ab42e2787f7 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -43,7 +43,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) if (f_handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to open %s for writing: %p\n"), + ACE_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to open %s for writing: %p\n"), filename), -1); else @@ -54,7 +54,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) char *data = ior_buffer.read (EOF,'\n','\n'); if (data == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior: %p\n")), + ACE_TEXT("[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior: %p\n")), -1); int result = 0; @@ -67,7 +67,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) str = ACE_OS::strtok (0, "\n")) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("iors -> |%s|\n"), + ACE_TEXT("iors -> |%s|\n"), ACE_TEXT_CHAR_TO_TCHAR(str))); CORBA::Object_var objref = @@ -79,7 +79,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) if (CORBA::is_nil (objref.in ())) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("IOR for the server is Null\n"))); + ACE_TEXT("IOR for the server is Null\n"))); result = -1; break; } @@ -94,7 +94,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Exception")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception")); } ACE_ENDTRY; @@ -110,7 +110,7 @@ int Clerk_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("dt:u:f:o:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dt:u:f:o:")); int c, result; @@ -136,18 +136,18 @@ Clerk_i::parse_args (int argc, if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to read ior from %s : %p\n"), + ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to read ior from %s : %p\n"), get_opts.opt_arg ()), -1); break; case 'o': // output the Clerk IOR to a file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), ACE_LIB_TEXT("w")); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %\n"), get_opts.opt_arg ()), -1); break; @@ -155,14 +155,14 @@ Clerk_i::parse_args (int argc, /* FALLTHRU */ default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t)") - ACE_LIB_TEXT("usage: %s") - ACE_LIB_TEXT(" [-d]") - ACE_LIB_TEXT(" [-t] <Timer value inn Secs>") - ACE_LIB_TEXT(" [-u] <Timer value in uSecs>") - ACE_LIB_TEXT(" [-f] <ior_input_file>") - ACE_LIB_TEXT(" [-o] <ior_output_file>") - ACE_LIB_TEXT("\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)") + ACE_TEXT("usage: %s") + ACE_TEXT(" [-d]") + ACE_TEXT(" [-t] <Timer value inn Secs>") + ACE_TEXT(" [-u] <Timer value in uSecs>") + ACE_TEXT(" [-f] <ior_input_file>") + ACE_TEXT(" [-o] <ior_output_file>") + ACE_TEXT("\n"), argv[0]), 1); } @@ -206,8 +206,8 @@ Clerk_i::get_first_IOR (void) if (CORBA::is_nil (server_context.in ())) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("TAO_Time_Service_Clerk::get_server_IORs:") - ACE_LIB_TEXT("No Active Servers in the Network\n"))); + ACE_TEXT("TAO_Time_Service_Clerk::get_server_IORs:") + ACE_TEXT("No Active Servers in the Network\n"))); // Get the first element and an iterator over the other // elements. @@ -230,8 +230,8 @@ Clerk_i::get_first_IOR (void) if (CORBA::is_nil (obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to Resolve ") - ACE_LIB_TEXT("Server Reference\n")), + ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to Resolve ") + ACE_TEXT("Server Reference\n")), -1); // Insert the first server IOR into the unbounded set of server @@ -243,12 +243,12 @@ Clerk_i::get_first_IOR (void) if (next_n_IORs (iter, server_context) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")), + ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")), -1);; } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Exception")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception")); return -1; } ACE_ENDTRY; @@ -277,7 +277,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Getting IOR of the server: %s\n\n"), + ACE_TEXT("Getting IOR of the server: %s\n\n"), ACE_TEXT_CHAR_TO_TCHAR(binding->binding_name[0].id.in ()))); CosNaming::Name server_name; @@ -305,7 +305,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("Unexpected exception in next_n_IORs\n")); + ACE_TEXT("Unexpected exception in next_n_IORs\n")); return -1; } ACE_ENDTRY; @@ -351,7 +351,7 @@ Clerk_i::create_clerk (void) // Print the clerk IOR on the console. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(objref_clerk.in ()))); // Print the Time Service clerk IOR to a file. @@ -368,7 +368,7 @@ Clerk_i::create_clerk (void) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Exception")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception")); return -1; } ACE_ENDTRY; @@ -427,7 +427,7 @@ Clerk_i::register_clerk (void) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("(%P|%t) Exception from init_naming_service ()\n")); + ACE_TEXT("(%P|%t) Exception from init_naming_service ()\n")); } ACE_ENDTRY; @@ -465,8 +465,8 @@ Clerk_i::init (int argc, "child_poa" ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("init_child_poa")), + ACE_TEXT("%p\n"), + ACE_TEXT("init_child_poa")), -1); ACE_TRY_CHECK; @@ -483,7 +483,7 @@ Clerk_i::init (int argc, if (!this->ior_fp_) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("IOR file not specified. Using the Naming Service instead\n"))); + ACE_TEXT("IOR file not specified. Using the Naming Service instead\n"))); // Initialize the Naming Service. if (this->init_naming_service () !=0 ) @@ -514,7 +514,7 @@ Clerk_i::init (int argc, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("(%P|%t) Exception in Clerk_i::init ()\n")); + ACE_TEXT("(%P|%t) Exception in Clerk_i::init ()\n")); return -1; } ACE_ENDTRY; @@ -533,13 +533,13 @@ Clerk_i::run (ACE_ENV_SINGLE_ARG_DECL) if (r == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run")), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run")), -1); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("(%P|%t) Exception in Clerk_i::run ()\n")); + ACE_TEXT("(%P|%t) Exception in Clerk_i::run ()\n")); } ACE_ENDTRY; diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index e0d95557992..b1c846e398f 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -31,7 +31,7 @@ int Server_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("do:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) @@ -42,21 +42,21 @@ Server_i::parse_args (int argc, break; case 'o': // output the IOR to a file. this->ior_output_file_ = - ACE_OS::fopen (get_opts.opt_arg (), ACE_LIB_TEXT("a")); + ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("a")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %p\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %p\n"), get_opts.opt_arg ()), -1); break; case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t)") - ACE_LIB_TEXT("usage: %s") - ACE_LIB_TEXT(" [-d]") - ACE_LIB_TEXT(" [-o] <ior_output_file>") - ACE_LIB_TEXT("\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)") + ACE_TEXT("usage: %s") + ACE_TEXT(" [-d]") + ACE_TEXT(" [-o] <ior_output_file>") + ACE_TEXT("\n"), argv[0]), 1); } @@ -121,8 +121,8 @@ Server_i::create_server (void) // Print the server IOR on the console. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ") - ACE_LIB_TEXT("SERVER IOR: <%s>\n"), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ") + ACE_TEXT("SERVER IOR: <%s>\n"), ACE_TEXT_CHAR_TO_TCHAR(objref_server.in ()))); // Print the IOR to a file. @@ -139,7 +139,7 @@ Server_i::create_server (void) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("Exception in Server_i::create_server ()")); + ACE_TEXT("Exception in Server_i::create_server ()")); return -1; } ACE_ENDTRY; @@ -193,13 +193,13 @@ Server_i::register_server (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Binding ServerContext -> %s\n"), + ACE_TEXT("Binding ServerContext -> %s\n"), ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ()))); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("(%P|%t) Exception from Register Server ()\n")); + ACE_TEXT("(%P|%t) Exception from Register Server ()\n")); return -1; } ACE_ENDTRY; @@ -233,8 +233,8 @@ Server_i::init (int argc, if (retval == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("init_child_poa")), + ACE_TEXT("%p\n"), + ACE_TEXT("init_child_poa")), -1); // Activate the POA Manager. @@ -261,7 +261,7 @@ Server_i::init (int argc, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Exception:")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception:")); return -1; } ACE_ENDTRY; @@ -280,7 +280,7 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL) if (retval == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("[SERVER] Process/Thread Id : (%P/%t) Server_i::run")), + ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Server_i::run")), -1); return 0; } diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 093638f354f..3150924e4e6 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -12,15 +12,15 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader) if (this->shutdown_.register_handler (SIGINT, this) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("register_handler"))); + ACE_TEXT("%p\n"), + ACE_TEXT("register_handler"))); #ifndef ACE_HAS_WINCE if (this->shutdown_.register_handler (SIGTERM, this) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("register_handler"))); + ACE_TEXT("%p\n"), + ACE_TEXT("register_handler"))); #endif // ACE_HAS_WINCE } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 2a1c42434b4..942d444d0cf 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -32,7 +32,7 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-LanePriority")))) // LanePriority + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LanePriority")))) // LanePriority { if (current_arg != 0) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index f3aa4a7322e..2acb6bcc18b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -33,7 +33,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -42,7 +42,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -171,7 +171,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; // Write the ior to a file to signal waiting consumers. - FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_LIB_TEXT("w")); + FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w")); if (ior_output_file != 0) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 11e04f8f4dc..480dbb5005c 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -34,19 +34,19 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool. + if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool. { this->proxy_supplier_thread_count_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-Delay")))) // seconds wait in consumer per push. + else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-Delay")))) // seconds wait in consumer per push. { this->delay_ = ACE_OS::atoi (current_arg); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index ed563e2e69d..fb8dcf0c8ad 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -36,7 +36,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -45,17 +45,17 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool. { this->ec_thread_count_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool. { this->proxy_consumer_thread_count_= ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -64,7 +64,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_LIB_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); @@ -169,7 +169,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; // Write the ior to a file to signal waiting consumers. - FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_LIB_TEXT("w")); + FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w")); if (ior_output_file != 0) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 78da73b4007..6f6144cc370 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -63,25 +63,25 @@ TAO_CEC_Default_Factory::parse_collection_arg (ACE_TCHAR* opt) int iteration_type = 0; ACE_TCHAR* aux = 0; - for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_LIB_TEXT(":"), &aux); + for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux); arg != 0; - arg = ACE_OS::strtok_r (0, ACE_LIB_TEXT(":"), &aux)) + arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux)) { - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("mt")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0) synch_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("st")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("st")) == 0) synch_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("list")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("list")) == 0) collection_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("rb_tree")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("rb_tree")) == 0) collection_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("immediate")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("immediate")) == 0) iteration_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_read")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_read")) == 0) iteration_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_write")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_write")) == 0) iteration_type = 2; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("delayed")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else ACE_ERROR ((LM_ERROR, @@ -106,18 +106,18 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) { const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECDispatching")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECDispatching")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->dispatching_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("mt")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) { this->dispatching_ = 1; } @@ -132,7 +132,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECDispatchingThreads")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECDispatchingThreads")) == 0) { arg_shifter.consume_arg (); @@ -144,7 +144,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxyConsumerCollection")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECProxyConsumerCollection")) == 0) { arg_shifter.consume_arg (); @@ -158,7 +158,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxySupplierCollection")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECProxySupplierCollection")) == 0) { arg_shifter.consume_arg (); @@ -173,22 +173,22 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxyConsumerLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECProxyConsumerLock")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->consumer_lock_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("thread")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("thread")) == 0) { this->consumer_lock_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("recursive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) { this->consumer_lock_ = 2; } @@ -203,22 +203,22 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxySupplierLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECProxySupplierLock")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->supplier_lock_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("thread")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("thread")) == 0) { this->supplier_lock_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("recursive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) { this->supplier_lock_ = 2; } @@ -233,7 +233,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECReactivePullingPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECReactivePullingPeriod")) == 0) { arg_shifter.consume_arg (); @@ -245,7 +245,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECUseORBId")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECUseORBId")) == 0) { arg_shifter.consume_arg (); @@ -258,18 +258,18 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControl")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECConsumerControl")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->consumer_control_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->consumer_control_ = 1; } @@ -284,18 +284,18 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControl")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECSupplierControl")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->supplier_control_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->supplier_control_ = 1; } @@ -310,7 +310,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECConsumerControlPeriod")) == 0) { arg_shifter.consume_arg (); @@ -322,7 +322,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECSupplierControlPeriod")) == 0) { arg_shifter.consume_arg (); @@ -334,8 +334,8 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlTimeout")) == 0 || - ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECConsumerControlRoundtripTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECConsumerControlTimeout")) == 0 || + ACE_OS::strcasecmp (arg, ACE_TEXT("-CECConsumerControlRoundtripTimeout")) == 0) { arg_shifter.consume_arg (); @@ -348,8 +348,8 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlTimeout")) == 0 || - ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECSupplierControlRoundtripTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECSupplierControlTimeout")) == 0 || + ACE_OS::strcasecmp (arg, ACE_TEXT("-CECSupplierControlRoundtripTimeout")) == 0) { arg_shifter.consume_arg (); @@ -362,7 +362,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-CECProxyDisconnectRetries")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-CECProxyDisconnectRetries")) == 0) { arg_shifter.consume_arg (); @@ -374,7 +374,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strncmp (arg, ACE_LIB_TEXT("-CEC"), 3) == 0) + else if (ACE_OS::strncmp (arg, ACE_TEXT("-CEC"), 3) == 0) { arg_shifter.consume_arg (); ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 5a7404c81e6..58ad965fe0e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -94,9 +94,9 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // Parse the options, check if we should bind with the naming // service and under what name... - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("n:o:p:xrtd")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd")); int opt; - const ACE_TCHAR *service_name = ACE_LIB_TEXT("CosEventService"); + const ACE_TCHAR *service_name = ACE_TEXT("CosEventService"); const ACE_TCHAR *ior_file = 0; const ACE_TCHAR *pid_file = 0; this->bind_to_naming_service_ = 1; @@ -220,7 +220,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *iorf = ACE_OS::fopen (ior_file, ACE_LIB_TEXT("w")); + FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (iorf != 0) { ACE_OS::fprintf (iorf, "%s\n", ior.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index af95e004b51..296ffd4a094 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -79,16 +79,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) { const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECDispatching")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->dispatching_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("mt")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) this->dispatching_ = 1; else this->unsupported_option_value ("-ECDispatching", opt); @@ -96,7 +96,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECDispatchingThreads")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatchingThreads")) == 0) { arg_shifter.consume_arg (); @@ -108,18 +108,18 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECFiltering")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECFiltering")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->filtering_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("basic")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("basic")) == 0) this->filtering_ = 1; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("prefix")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) this->filtering_ = 2; else this->unsupported_option_value ("-ECFiltering", opt); @@ -127,18 +127,18 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierFilter")) == 0 + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierFilter")) == 0 // @@ TODO remove, only for backwards compatibility - || ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierFiltering")) == 0) + || ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierFiltering")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->supplier_filtering_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("per-supplier")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-supplier")) == 0) this->supplier_filtering_ = 1; else this->unsupported_option_value ("-ECSupplierFilter", opt); @@ -146,14 +146,14 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTimeout")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->timeout_ = 0; else this->unsupported_option_value ("-ECTimeout", opt); @@ -161,18 +161,18 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECObserver")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECObserver")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->observer_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("basic")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("basic")) == 0) this->observer_ = 1; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->observer_ = 2; else this->unsupported_option_value ("-ECObserver", opt); @@ -180,16 +180,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECScheduling")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECScheduling")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->scheduling_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("group")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) this->scheduling_ = 1; else this->unsupported_option_value ("-ECScheduling", opt); @@ -197,7 +197,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECProxyPushConsumerCollection")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECProxyPushConsumerCollection")) == 0) { arg_shifter.consume_arg (); @@ -210,25 +210,25 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) int iteration_type = 0; ACE_TCHAR* aux; - for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_LIB_TEXT(":"), &aux); + for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux); arg != 0; - arg = ACE_OS::strtok_r (0, ACE_LIB_TEXT(":"), &aux)) + arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux)) { - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("mt")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0) synch_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("st")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("st")) == 0) synch_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("list")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("list")) == 0) collection_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("rb_tree")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("rb_tree")) == 0) collection_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("immediate")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("immediate")) == 0) iteration_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_read")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_read")) == 0) iteration_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_write")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_write")) == 0) iteration_type = 2; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("delayed")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else ACE_ERROR ((LM_ERROR, @@ -242,7 +242,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECProxyPushSupplierCollection")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECProxyPushSupplierCollection")) == 0) { arg_shifter.consume_arg (); @@ -255,25 +255,25 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) int iteration_type = 0; ACE_TCHAR* aux; - for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_LIB_TEXT(":"), &aux); + for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux); arg != 0; - arg = ACE_OS::strtok_r (0, ACE_LIB_TEXT(":"), &aux)) + arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux)) { - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("mt")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0) synch_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("st")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("st")) == 0) synch_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("list")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("list")) == 0) collection_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("rb_tree")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("rb_tree")) == 0) collection_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("immediate")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("immediate")) == 0) iteration_type = 0; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_read")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_read")) == 0) iteration_type = 1; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("copy_on_write")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_write")) == 0) iteration_type = 2; - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("delayed")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else ACE_ERROR ((LM_ERROR, @@ -287,18 +287,18 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECProxyConsumerLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECProxyConsumerLock")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->consumer_lock_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("thread")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("thread")) == 0) this->consumer_lock_ = 1; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("recursive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->consumer_lock_ = 2; else this->unsupported_option_value ("-ECProxyConsumerLock", opt); @@ -306,18 +306,18 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECProxySupplierLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECProxySupplierLock")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->supplier_lock_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("thread")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("thread")) == 0) this->supplier_lock_ = 1; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("recursive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0) this->supplier_lock_ = 2; else this->unsupported_option_value ("-ECProxySupplierLock", opt); @@ -325,7 +325,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECUseORBId")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECUseORBId")) == 0) { arg_shifter.consume_arg (); @@ -337,16 +337,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECConsumerControl")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerControl")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->consumer_control_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->consumer_control_ = 1; else this->unsupported_option_value ("-ECConsumerControl", opt); @@ -354,16 +354,16 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierControl")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierControl")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->supplier_control_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->supplier_control_ = 1; else this->unsupported_option_value ("-ECSupplierControl", opt); @@ -371,7 +371,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECConsumerControlPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerControlPeriod")) == 0) { arg_shifter.consume_arg (); @@ -383,7 +383,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierControlPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierControlPeriod")) == 0) { arg_shifter.consume_arg (); @@ -395,7 +395,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECConsumerControlTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerControlTimeout")) == 0) { arg_shifter.consume_arg (); @@ -408,7 +408,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierControlTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierControlTimeout")) == 0) { arg_shifter.consume_arg (); @@ -421,7 +421,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECConsumerValidateConnection")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerValidateConnection")) == 0) { arg_shifter.consume_arg (); @@ -433,7 +433,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECPushSupplierSet")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECPushSupplierSet")) == 0) { ACE_ERROR ((LM_ERROR, "EC_Default_Factory - " @@ -441,7 +441,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECQueueFullServiceObject")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECQueueFullServiceObject")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) @@ -452,7 +452,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECConsumerAdminLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerAdminLock")) == 0) { ACE_ERROR ((LM_ERROR, "EC_Default_Factory - " @@ -460,7 +460,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECSupplierAdminLock")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierAdminLock")) == 0) { ACE_ERROR ((LM_ERROR, "EC_Default_Factory - " @@ -468,7 +468,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) arg_shifter.consume_arg (); } - else if (ACE_OS::strncmp (arg, ACE_LIB_TEXT("-EC"), 3) == 0) + else if (ACE_OS::strncmp (arg, ACE_TEXT("-EC"), 3) == 0) { arg_shifter.consume_arg (); ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 48671fe8343..9050514afea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -60,18 +60,18 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) { const char *arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPConsumerECControl")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControl")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) this->consumer_ec_control_ = 0; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) this->consumer_ec_control_ = 1; - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reconnect")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reconnect")) == 0) this->consumer_ec_control_ = 2; else this->unsupported_option_value ("-ECGIIOPConsumerECControl", opt); @@ -79,7 +79,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPConsumerECControlPeriod")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControlPeriod")) == 0) { arg_shifter.consume_arg (); @@ -91,7 +91,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPConsumerECControlTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControlTimeout")) == 0) { arg_shifter.consume_arg (); @@ -104,7 +104,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPUseORBId")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPUseORBId")) == 0) { arg_shifter.consume_arg (); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPUseTTL")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPUseTTL")) == 0) { arg_shifter.consume_arg (); @@ -128,7 +128,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECGIIOPUseConsumerProxyMap")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPUseConsumerProxyMap")) == 0) { arg_shifter.consume_arg (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index a40af3f6c2a..6c37bf5598a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -15,8 +15,8 @@ #include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Kokyu_Factory, +ACE_RCSID (Event, + EC_Kokyu_Factory, "$Id$") TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) @@ -39,30 +39,30 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) { const ACE_TCHAR* arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECDispatching")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->dispatching_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("mt")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) { this->dispatching_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("kokyu")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("kokyu")) == 0) { this->dispatching_ = 2; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Kokyu_Factory - ") - ACE_LIB_TEXT("unsupported dispatching <%s>\n"), + ACE_TEXT("EC_Kokyu_Factory - ") + ACE_TEXT("unsupported dispatching <%s>\n"), opt)); } arg_shifter.consume_arg (); @@ -73,11 +73,11 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("SCHED_FIFO")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("SCHED_FIFO")) == 0) { this->disp_sched_policy_ = ACE_SCHED_FIFO; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("SCHED_RR")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("SCHED_RR")) == 0) { this->disp_sched_policy_ = ACE_SCHED_RR; } @@ -90,11 +90,11 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("SYSTEM")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("SYSTEM")) == 0) { this->disp_sched_policy_ = ACE_SCOPE_THREAD; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("PROCESS")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("PROCESS")) == 0) { this->disp_sched_policy_ = ACE_SCOPE_PROCESS; } @@ -104,53 +104,53 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECFiltering")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECFiltering")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->filtering_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("basic")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("basic")) == 0) { this->filtering_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("prefix")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) { this->filtering_ = 2; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("kokyu")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("kokyu")) == 0) { this->filtering_ = 3; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Kokyu_Factory - ") - ACE_LIB_TEXT("unsupported filtering <%s>\n"), + ACE_TEXT("EC_Kokyu_Factory - ") + ACE_TEXT("unsupported filtering <%s>\n"), opt)); } arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTimeout")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->timeout_ = 0; } #if 0 - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("kokyu")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("kokyu")) == 0) { this->timeout_ = 1; } @@ -158,38 +158,38 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Kokyu_Factory - ") - ACE_LIB_TEXT("unsupported timeout <%s>\n"), + ACE_TEXT("EC_Kokyu_Factory - ") + ACE_TEXT("unsupported timeout <%s>\n"), opt)); } arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECScheduling")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECScheduling")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->scheduling_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("group")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) { this->scheduling_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("kokyu")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("kokyu")) == 0) { this->scheduling_ = 2; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Kokyu_Factory - ") - ACE_LIB_TEXT("unsupported scheduling <%s>\n"), + ACE_TEXT("EC_Kokyu_Factory - ") + ACE_TEXT("unsupported scheduling <%s>\n"), opt)); } arg_shifter.consume_arg (); @@ -216,8 +216,8 @@ TAO_EC_Dispatching* TAO_EC_Kokyu_Factory::create_dispatching (TAO_EC_Event_Channel_Base *ec) { if (this->dispatching_ == 2) - return new TAO_EC_Kokyu_Dispatching (ec, - this->disp_sched_policy_, + return new TAO_EC_Kokyu_Dispatching (ec, + this->disp_sched_policy_, this->disp_sched_scope_); return this->TAO_EC_Default_Factory::create_dispatching (ec); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 0199dec1957..16f8510732a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -30,83 +30,83 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) { const ACE_TCHAR* arg = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECDispatching")) == 0) + if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->dispatching_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("mt")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0) { this->dispatching_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("priority")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("priority")) == 0) { this->dispatching_ = 2; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Sched_Factory - ") - ACE_LIB_TEXT("unsupported dispatching <%s>\n"), + ACE_TEXT("EC_Sched_Factory - ") + ACE_TEXT("unsupported dispatching <%s>\n"), opt)); } arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECFiltering")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECFiltering")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->filtering_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("basic")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("basic")) == 0) { this->filtering_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("prefix")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0) { this->filtering_ = 2; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("priority")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("priority")) == 0) { this->filtering_ = 3; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Sched_Factory - ") - ACE_LIB_TEXT("unsupported filtering <%s>\n"), + ACE_TEXT("EC_Sched_Factory - ") + ACE_TEXT("unsupported filtering <%s>\n"), opt)); } arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECTimeout")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTimeout")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("reactive")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0) { this->timeout_ = 0; } #if 0 - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("priority")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("priority")) == 0) { this->timeout_ = 1; } @@ -114,38 +114,38 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Sched_Factory - ") - ACE_LIB_TEXT("unsupported timeout <%s>\n"), + ACE_TEXT("EC_Sched_Factory - ") + ACE_TEXT("unsupported timeout <%s>\n"), opt)); } arg_shifter.consume_arg (); } } - else if (ACE_OS::strcasecmp (arg, ACE_LIB_TEXT("-ECScheduling")) == 0) + else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECScheduling")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("null")) == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("null")) == 0) { this->scheduling_ = 0; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("group")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0) { this->scheduling_ = 1; } - else if (ACE_OS::strcasecmp (opt, ACE_LIB_TEXT("priority")) == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("priority")) == 0) { this->scheduling_ = 2; } else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("EC_Sched_Factory - ") - ACE_LIB_TEXT("unsupported scheduling <%s>\n"), + ACE_TEXT("EC_Sched_Factory - ") + ACE_TEXT("unsupported scheduling <%s>\n"), opt)); } arg_shifter.consume_arg (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index d5cdd436cb0..847b12d8284 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -41,7 +41,7 @@ namespace TAO_FTRT { // Parse any service configurator parameters. for (curarg = 0; curarg < argc; curarg++) if (ACE_OS::strcasecmp (argv[curarg], - ACE_LIB_TEXT("-ORBTransactionDepth")) == 0) + ACE_TEXT("-ORBTransactionDepth")) == 0) { curarg++; if (curarg < argc) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 0cb53c28f0b..59af4a913d7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -44,7 +44,7 @@ namespace FTRTEC { Fault_Detector* detector = 0; // Parse any service configurator parameters. - if (argc > 0 && ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("sctp")) == 0) + if (argc > 0 && ACE_OS::strcasecmp (argv[0], ACE_TEXT("sctp")) == 0) { #if (TAO_HAS_SCIOP == 1) ACE_AUTO_PTR_RESET(detector_, detector, Fault_Detector); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 07bc65e593f..9865ee48eed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -37,7 +37,7 @@ namespace FTRTEC { name_[0].id = CORBA::string_dup("FT_EventService"); while (argc > 1) { - if ( ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("-Object_ID")) == 0) { + if ( ACE_OS::strcasecmp (argv[0], ACE_TEXT("-Object_ID")) == 0) { --argc; ++argv; if (argv[0][0] == '-') continue; else if (argv[0][0] != '$') { @@ -49,7 +49,7 @@ namespace FTRTEC { } --argc; ++argv; } - else if (ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("-Name")) ==0) { + else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-Name")) ==0) { --argc; ++argv; if (argv[0][0] == '-') continue; else if (argv[0][0] != '$') { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 737b88ccc8c..fd0f6484c9a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -53,9 +53,9 @@ namespace FTRTEC // Parse any service configurator parameters. while (argc > 0) { - if (ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("AMI")) ==0 ) + if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("AMI")) ==0 ) ami = true; - if (ACE_OS::strcasecmp (argv[0], ACE_LIB_TEXT("-threads")) ==0 && argc > 1) { + if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-threads")) ==0 && argc > 1) { FTRTEC::threads = ACE_OS::atoi(argv[1]); if (FTRTEC::threads ==0 ) FTRTEC::threads = 1; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 656d2b87c53..7e244d416ce 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -538,8 +538,8 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, for (CORBA::ULong i = 0; i < this->endpoint_count_; ++i) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ") - ACE_LIB_TEXT ("listening on: <%s:%u>\n"), + ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ") + ACE_TEXT ("listening on: <%s:%u>\n"), ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), this->addrs_[i].get_port_number ())); } @@ -781,8 +781,8 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) TAO::HTIOP::Acceptor::object_key - ") - ACE_LIB_TEXT ("error while decoding host/port"))); + ACE_TEXT ("TAO (%P|%t) TAO::HTIOP::Acceptor::object_key - ") + ACE_TEXT ("error while decoding host/port"))); } return -1; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index 9b778293976..dbc2c7afb7c 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -243,7 +243,7 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close () // Shut down the listen socket to recycle the handles. if (this->accept_strategy_->acceptor ().close () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close\n"))); + ACE_TEXT ("close\n"))); // Set the Reactor to 0 so that we don't try to close down // again. this->reactor (0); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index ca5eb903363..81e2b1b6d16 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -104,8 +104,8 @@ TAO::HTIOP::Completion_Handler::handle_input (ACE_HANDLE h) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO::HTIOP::Completion_Handler %p\n"), - ACE_LIB_TEXT ("make_svc_handler"))); + ACE_TEXT ("TAO::HTIOP::Completion_Handler %p\n"), + ACE_TEXT ("make_svc_handler"))); return -1; } @@ -130,8 +130,8 @@ TAO::HTIOP::Completion_Handler::handle_input (ACE_HANDLE h) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("activate_svc_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("activate_svc_handler"))); return -1; } #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 6098cb61f15..2695752f4b8 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -245,7 +245,7 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("(%P|%t) Listening port [%d] on [%s],[%s]\n"), + ACE_TEXT("(%P|%t) Listening port [%d] on [%s],[%s]\n"), listen_point.port, ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()), ACE_TEXT_CHAR_TO_TCHAR(listen_point.htid.in()))); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index ed168950b1c..79dba60c387 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -101,10 +101,10 @@ TAO::HTIOP::Connector::set_validate_endpoint (TAO_Endpoint *endpoint) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) TAO_HTIOP connection failed.\n") - ACE_LIB_TEXT ("TAO (%P|%t) This is most likely ") - ACE_LIB_TEXT ("due to a hostname lookup ") - ACE_LIB_TEXT ("failure.\n"))); + ACE_TEXT ("TAO (%P|%t) TAO_HTIOP connection failed.\n") + ACE_TEXT ("TAO (%P|%t) This is most likely ") + ACE_TEXT ("due to a hostname lookup ") + ACE_TEXT ("failure.\n"))); } return -1; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 93cf1521f66..46d668688ea 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -75,7 +75,7 @@ TAO_IFR_Server::init_with_orb (int argc, { ACE_ERROR_RETURN (( LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) Unable to initialize the POA.\n") + ACE_TEXT ("(%P|%t) Unable to initialize the POA.\n") ), -1 ); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp index 19c6ede797d..fa5368191bc 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp @@ -197,15 +197,15 @@ TAO_NS_FlatFileStream::operator <<( ACE_OS::fprintf(this->fl_, "%d\n", type); ACE_CString id = record.id(); - ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT("\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT("\n%s\n"), id.length(), id.c_str()); ACE_CString kind = record.kind(); - ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("\n%s\n"), kind.length(), kind.c_str()); ACE_CString ref = record.ref(); - ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("\n%s\n"), + ACE_OS::fprintf(this->fl_, ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("\n%s\n"), ref.length(), ref.c_str()); ACE_OS::fflush(this->fl_); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 85bc1c2e675..87ed4a6d2ca 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -165,7 +165,7 @@ int TAO_Naming_Server::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT("b:do:p:s:f:m:u:r:z:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:")); int c; int size, result; @@ -240,26 +240,26 @@ TAO_Naming_Server::parse_args (int argc, case '?': default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("usage: %s ") - ACE_LIB_TEXT ("-d ") - ACE_LIB_TEXT ("-o <ior_output_file> ") - ACE_LIB_TEXT ("-p <pid_file_name> ") - ACE_LIB_TEXT ("-s <context_size> ") - ACE_LIB_TEXT ("-b <base_address> ") - ACE_LIB_TEXT ("-m <1=enable multicast, 0=disable multicast(default) ") - ACE_LIB_TEXT ("-f <persistence_file_name> ") - ACE_LIB_TEXT ("-u <storable_persistence_directory (not used with -f)> ") - ACE_LIB_TEXT ("-r <redundant_persistence_directory> ") - ACE_LIB_TEXT ("-z <relative round trip timeout> ") - ACE_LIB_TEXT ("\n"), + ACE_TEXT ("usage: %s ") + ACE_TEXT ("-d ") + ACE_TEXT ("-o <ior_output_file> ") + ACE_TEXT ("-p <pid_file_name> ") + ACE_TEXT ("-s <context_size> ") + ACE_TEXT ("-b <base_address> ") + ACE_TEXT ("-m <1=enable multicast, 0=disable multicast(default) ") + ACE_TEXT ("-f <persistence_file_name> ") + ACE_TEXT ("-u <storable_persistence_directory (not used with -f)> ") + ACE_TEXT ("-r <redundant_persistence_directory> ") + ACE_TEXT ("-z <relative round trip timeout> ") + ACE_TEXT ("\n"), argv [0]), -1); } if (f_opt_used + u_opt_used + r_opt_used > 1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Only one persistence option can be passed") - ACE_LIB_TEXT ("\n")), + ACE_TEXT ("Only one persistence option can be passed") + ACE_TEXT ("\n")), -1); return 0; @@ -286,7 +286,7 @@ TAO_Naming_Server::init_with_orb (int argc, if (CORBA::is_nil (poa_object.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT(" (%P|%t) Unable to initialize the POA.\n")), + ACE_TEXT(" (%P|%t) Unable to initialize the POA.\n")), -1); } @@ -397,14 +397,14 @@ TAO_Naming_Server::init_with_orb (int argc, if (this->ior_file_name_ != 0) { - FILE *iorf = ACE_OS::fopen (this->ior_file_name_, ACE_LIB_TEXT("w")); + FILE *iorf = ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w")); if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Unable to open %s for writing:(%u) %p\n"), + ACE_TEXT("Unable to open %s for writing:(%u) %p\n"), this->ior_file_name_, errno, - ACE_LIB_TEXT("TAO_Naming_Server::init_with_orb")), + ACE_TEXT("TAO_Naming_Server::init_with_orb")), -1); } @@ -416,7 +416,7 @@ TAO_Naming_Server::init_with_orb (int argc, if (this->pid_file_name_ != 0) { - FILE *pidf = ACE_OS::fopen (this->pid_file_name_, ACE_LIB_TEXT("w")); + FILE *pidf = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -459,7 +459,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, if (persistence_location == 0) { // No, assign the default location "NameService" - persistence_location = ACE_LIB_TEXT("NameService"); + persistence_location = ACE_TEXT("NameService"); } // Now make sure this directory exists diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 4ee5d1c47f8..7bf71e8d379 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -43,38 +43,38 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) while (arg_shifter.is_anything_left ()) { - if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-MTDispatching")) == 0) + if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTDispatching")) == 0) { // If Dispatching Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-DispatchingThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) { dispatching_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-MTSourceEval")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTSourceEval")) == 0) { // If Source Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-SourceThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) { source_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-MTLookup")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTLookup")) == 0) { // If Lookup Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-LookupThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) { // Since this option is always either added to source_threads // or ignored, we'll deprecate it in favor of that option. @@ -83,14 +83,14 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads \n"))); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-MTListenerEval")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0) { // If Listener Threads are initalized, the option is implicit. arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-ListenerThreads")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) { // Since this option is always added to dispatching_threads, we'll // deprecate it in favor of that option. @@ -99,24 +99,24 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) listener_threads = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-AsynchUpdates")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AsynchUpdates")) == 0) { arg_shifter.consume_arg (); properties->asynch_updates (1); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-NoUpdates")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-NoUpdates")) == 0) { arg_shifter.consume_arg (); properties->updates (0); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-AllocateTaskperProxy")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AllocateTaskperProxy")) == 0) { task_per_proxy = 1; arg_shifter.consume_arg (); } - else if (arg_shifter.cur_arg_strncasecmp (ACE_LIB_TEXT("-AllowReconnect")) == 0) + else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AllowReconnect")) == 0) { arg_shifter.consume_arg (); TAO_Notify_PROPERTIES::instance()->allow_reconnect (true); diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index b4bea6cb946..45f36427bff 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -437,7 +437,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, if (lookup_rt_info (d.rt_info, temp_info) != SUCCEEDED) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("cannot find %d to add dependency\n"), d.rt_info)); + ACE_TEXT("cannot find %d to add dependency\n"), d.rt_info)); return -1; } @@ -447,15 +447,15 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info, default: ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("unrecognized dependency type %d for %s\n"), + ACE_TEXT("unrecognized dependency type %d for %s\n"), d.dependency_type, ACE_TEXT_CHAR_TO_TCHAR(rt_info->entry_point.in ()))); return -1; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("Sched (%t) adding %s dependency to caller: %s\n"), + ACE_TEXT("Sched (%t) adding %s dependency to caller: %s\n"), (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL) - ? ACE_LIB_TEXT("TWO_WAY") : ACE_LIB_TEXT("ONE_WAY")), + ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")), ACE_TEXT_CHAR_TO_TCHAR(temp_info->entry_point.in ()))); RtecScheduler::Dependency_Set& set = temp_info->dependencies; @@ -514,7 +514,7 @@ ACE_DynScheduler::dispatch_configuration (const Preemption_Priority & p_priority if (lookup_config_info (p_priority, config_info) != SUCCEEDED) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Config info for priority %lu could not be found\n"), + ACE_TEXT("Config info for priority %lu could not be found\n"), p_priority), -1); } @@ -1551,8 +1551,8 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, ACE_DEBUG ( (LM_DEBUG, - ACE_LIB_TEXT("Warning: an operation identified by ") - ACE_LIB_TEXT("\"%s\" has unresolved remote dependencies.\n"), + ACE_TEXT("Warning: an operation identified by ") + ACE_TEXT("\"%s\" has unresolved remote dependencies.\n"), ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); // Record entry point in list of unresolved remote dependencies @@ -1567,9 +1567,9 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, // Local node that no one calls and has neither rate nor threads is suspect ACE_DEBUG ( (LM_DEBUG, - ACE_LIB_TEXT("Error: operation \"%s\" does not specify a period or\n") - ACE_LIB_TEXT("visible threads, and is not called by any other operation.\n") - ACE_LIB_TEXT("Are there backwards dependencies.\n"), + ACE_TEXT("Error: operation \"%s\" does not specify a period or\n") + ACE_TEXT("visible threads, and is not called by any other operation.\n") + ACE_TEXT("Are there backwards dependencies.\n"), ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point))); result = ST_UNRESOLVED_LOCAL_DEPENDENCIES; @@ -1654,7 +1654,7 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry) { // indicate the two tasks are in (the same) dependency cycle ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"), + ACE_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"), ACE_TEXT_CHAR_TO_TCHAR((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()), ACE_TEXT_CHAR_TO_TCHAR(entry.rt_info ()->entry_point.in ()))); @@ -1762,8 +1762,8 @@ ACE_DynScheduler::store_assigned_info (void) (! (ordered_dispatch_entries_[i]->task_entry ().rt_info ()))) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::store_assigned_info () could not store ") - ACE_LIB_TEXT("priority information (error in internal representation)")), + ACE_TEXT("ACE_DynScheduler::store_assigned_info () could not store ") + ACE_TEXT("priority information (error in internal representation)")), ST_BAD_INTERNAL_POINTER); } @@ -1929,7 +1929,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_priorities (file); @@ -1938,8 +1938,8 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") - ACE_LIB_TEXT("Could not open schedule file (\"%s\")"), + ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") + ACE_TEXT("Could not open schedule file (\"%s\")"), ACE_TEXT_CHAR_TO_TCHAR(filename))); } @@ -1992,8 +1992,8 @@ ACE_DynScheduler::output_dispatch_priorities (FILE *file) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") - ACE_LIB_TEXT("Could not write to schedule file\n")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") + ACE_TEXT("Could not write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } @@ -2008,8 +2008,8 @@ ACE_DynScheduler::output_dispatch_priorities (FILE *file) ordered_dispatch_entries_[i]->static_subpriority ()) < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") - ACE_LIB_TEXT("Could not write to schedule file\n")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ") + ACE_TEXT("Could not write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } } @@ -2024,7 +2024,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2033,8 +2033,8 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename) else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") - ACE_LIB_TEXT("Could not open schedule file (\"%s\")"), + ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") + ACE_TEXT("Could not open schedule file (\"%s\")"), filename)); } @@ -2051,8 +2051,8 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) "--------- ----------- ------- -------- ----- ------ ----------- ------- ------\n") < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") - ACE_LIB_TEXT("Could not write to schedule file")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") + ACE_TEXT("Could not write to schedule file")), UNABLE_TO_WRITE_SCHEDULE_FILE); } @@ -2066,8 +2066,8 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) if ((iter.next (link) == 0) || (! link)) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") - ACE_LIB_TEXT("Bad internal pointer\n")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") + ACE_TEXT("Bad internal pointer\n")), ST_BAD_INTERNAL_POINTER); } @@ -2106,8 +2106,8 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") - ACE_LIB_TEXT("Unable to write to schedule file\n")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") + ACE_TEXT("Unable to write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } } @@ -2131,8 +2131,8 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") - ACE_LIB_TEXT("Unable to write to schedule file\n")), + ACE_TEXT("ACE_DynScheduler::output_dispatch_timeline: ") + ACE_TEXT("Unable to write to schedule file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } } @@ -2149,7 +2149,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); if (file) { status = output_preemption_timeline (file); @@ -2158,8 +2158,8 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename) else { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_preemption_timeline: ") - ACE_LIB_TEXT("Cannot open timeline file (\"%s\")\n"), + ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") + ACE_TEXT("Cannot open timeline file (\"%s\")\n"), ACE_TEXT_CHAR_TO_TCHAR(filename))); } @@ -2176,8 +2176,8 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) "--------- ----------- ------ ------\n") < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_preemption_timeline: ") - ACE_LIB_TEXT("Cannot write to timeline file\n")), + ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") + ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } @@ -2189,8 +2189,8 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) if ((iter.next (link) == 0) || (! link)) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_preemption_timeline: ") - ACE_LIB_TEXT("Bad internal pointer\n")), + ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") + ACE_TEXT("Bad internal pointer\n")), ST_BAD_INTERNAL_POINTER); } @@ -2206,8 +2206,8 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) ACE_U64_TO_U32 (link->entry ().stop ())) < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_preemption_timeline: ") - ACE_LIB_TEXT("Cannot write to timeline file\n")), + ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") + ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } } @@ -2222,8 +2222,8 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file) ACE_U64_TO_U32 (link->entry ().stop ())) < 0) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_preemption_timeline: ") - ACE_LIB_TEXT("Cannot write to timeline file\n")), + ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ") + ACE_TEXT("Cannot write to timeline file\n")), UNABLE_TO_WRITE_SCHEDULE_FILE); } } @@ -2239,7 +2239,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename) status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE; // open the file - FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("w")); + FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); if (file) { status = output_dispatch_timeline (file); @@ -2361,20 +2361,20 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) { status = NOT_SCHEDULED; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_timeline: ") - ACE_LIB_TEXT("Schedule not generated"))); + ACE_TEXT("ACE_DynScheduler::output_timeline: ") + ACE_TEXT("Schedule not generated"))); } if (status == SUCCEEDED) { // open the file - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_LIB_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w")); if (! file) { status = UNABLE_TO_OPEN_SCHEDULE_FILE; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_timeline: ") - ACE_LIB_TEXT("Could not open schedule file"))); + ACE_TEXT("ACE_DynScheduler::output_timeline: ") + ACE_TEXT("Could not open schedule file"))); } } @@ -2384,8 +2384,8 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading) { status = UNABLE_TO_WRITE_SCHEDULE_FILE; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("ACE_DynScheduler::output_timeline: ") - ACE_LIB_TEXT("Could not write to schedule file"))); + ACE_TEXT("ACE_DynScheduler::output_timeline: ") + ACE_TEXT("Could not write to schedule file"))); } } diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 447c70230aa..20007440ad8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -213,13 +213,13 @@ void ACE_Scheduler::export_to_file (RT_Info& info, FILE* file) { // The divide-by-1 is for ACE_U_LongLong support. (void) ACE_OS::fprintf (file, - ACE_LIB_TEXT("%s\n%d\n") - ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT("\n") - ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT("\n") - ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT("\n") - ACE_LIB_TEXT("%d\n%d\n") - ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT("\n") - ACE_LIB_TEXT("%u\n# begin dependencies\n%d\n"), + ACE_TEXT("%s\n%d\n") + ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT("\n") + ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT("\n") + ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT("\n") + ACE_TEXT("%d\n%d\n") + ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT("\n") + ACE_TEXT("%u\n# begin dependencies\n%d\n"), (const char*)info.entry_point, info.handle, ORBSVCS_Time::to_hrtime (info.worst_case_execution_time) / 1, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 66a43636c82..447528532c9 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -131,8 +131,8 @@ int ACE_Scheduler_Factory::use_runtime (int cc, { if (server_ != 0 || TAO_SF_entry_count != -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_Scheduler_Factory::use_runtime - ") - ACE_LIB_TEXT("server already configured\n")), + ACE_TEXT("ACE_Scheduler_Factory::use_runtime - ") + ACE_TEXT("server already configured\n")), -1); TAO_SF_config_count = cc; TAO_SF_config_info = cfgi; @@ -165,13 +165,13 @@ static_server (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("ACE_Scheduler_Factory - configured static server\n"))); + ACE_TEXT("ACE_Scheduler_Factory - configured static server\n"))); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("ACE_Scheduler_Factory::config_runtime - ") - ACE_LIB_TEXT("cannot allocate server\n")); + ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ") + ACE_TEXT("cannot allocate server\n")); } ACE_ENDTRY; @@ -214,8 +214,8 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, { server_ = 0; ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("ACE_Scheduler_Factory::use_config - ") - ACE_LIB_TEXT(" exception while resolving server\n")); + ACE_TEXT("ACE_Scheduler_Factory::use_config - ") + ACE_TEXT(" exception while resolving server\n")); } ACE_ENDTRY; @@ -241,8 +241,8 @@ ACE_Scheduler_Factory::server (void) if (server_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_Scheduler_Factor::server - ") - ACE_LIB_TEXT("no scheduling service configured\n")), + ACE_TEXT("ACE_Scheduler_Factor::server - ") + ACE_TEXT("no scheduling service configured\n")), 0); return server_; } @@ -350,7 +350,7 @@ int ACE_Scheduler_Factory::dump_schedule FILE* file = stdout; if (file_name != 0) { - file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(file_name), ACE_LIB_TEXT("w")); + file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(file_name), ACE_TEXT("w")); if (file == 0) return -1; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index c3e59fff978..f80ab371010 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -723,69 +723,69 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) { const ACE_TCHAR* current_arg = arg_shifter.get_current (); - if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSthreadsafe")) == 0) + if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSthreadsafe")) == 0) { arg_shifter.consume_arg (); this->threadsafe_ = 1; } - else if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSconformance")) == 0) + else if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSconformance")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* conformance_str = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (conformance_str, ACE_LIB_TEXT("Linked")) == 0) + if (ACE_OS::strcasecmp (conformance_str, ACE_TEXT("Linked")) == 0) this->conformance_ = TAO_TRADER_LINKED; - else if (ACE_OS::strcasecmp (conformance_str, ACE_LIB_TEXT("Query")) == 0) + else if (ACE_OS::strcasecmp (conformance_str, ACE_TEXT("Query")) == 0) this->conformance_ = TAO_TRADER_QUERY; - else if (ACE_OS::strcasecmp (conformance_str, ACE_LIB_TEXT("Simple")) == 0) + else if (ACE_OS::strcasecmp (conformance_str, ACE_TEXT("Simple")) == 0) this->conformance_ = TAO_TRADER_SIMPLE; - else if (ACE_OS::strcasecmp (conformance_str, ACE_LIB_TEXT("Standalone")) == 0) + else if (ACE_OS::strcasecmp (conformance_str, ACE_TEXT("Standalone")) == 0) this->conformance_ = TAO_TRADER_STANDALONE; arg_shifter.consume_arg (); } } - else if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSsupports_dynamic_properties")) == 0) + else if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSsupports_dynamic_properties")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* arg_str = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("true")) == 0) + if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("true")) == 0) this->supports_dynamic_properties_ = 1; - else if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("false")) == 0) + else if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("false")) == 0) this->supports_dynamic_properties_ = 0; arg_shifter.consume_arg (); } } - else if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSsupports_modifiable_properties")) == 0) + else if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSsupports_modifiable_properties")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* arg_str = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("true")) == 0) + if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("true")) == 0) this->supports_modifiable_properties_ = 1; - else if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("false")) == 0) + else if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("false")) == 0) this->supports_modifiable_properties_ = 0; arg_shifter.consume_arg (); } } - else if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSdef_search_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSmax_search_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSdef_match_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSmax_match_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSdef_return_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSmax_return_card")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSdef_hop_count")) == 0 || - ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSmax_hop_count")) == 0) + else if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSdef_search_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSmax_search_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSdef_match_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSmax_match_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSdef_return_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSmax_return_card")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSdef_hop_count")) == 0 || + ACE_OS::strcmp (current_arg, ACE_TEXT("-TSmax_hop_count")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) @@ -794,22 +794,22 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) static_cast<CORBA::ULong> (ACE_OS::atoi (arg_shifter.get_current ())); arg_shifter.consume_arg (); - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("card"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("card"))) { - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("max"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("max"))) { - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("search"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("search"))) this->max_search_card_ = value; - else if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("match"))) + else if (ACE_OS::strstr (current_arg, ACE_TEXT("match"))) this->max_match_card_ = value; else this->max_return_card_ = value; } else { - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("search"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("search"))) this->def_search_card_ = value; - else if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("match"))) + else if (ACE_OS::strstr (current_arg, ACE_TEXT("match"))) this->def_match_card_ = value; else this->def_return_card_ = value; @@ -817,15 +817,15 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) } else { - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("max"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("max"))) this->max_hop_count_ = value; else this->def_hop_count_ = value; } } } - else if (ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSdef_follow_policy")) == 0 - || ACE_OS::strcmp (current_arg, ACE_LIB_TEXT("-TSmax_follow_policy")) == 0) + else if (ACE_OS::strcmp (current_arg, ACE_TEXT("-TSdef_follow_policy")) == 0 + || ACE_OS::strcmp (current_arg, ACE_TEXT("-TSmax_follow_policy")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) @@ -833,18 +833,18 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv) const ACE_TCHAR* arg_str = arg_shifter.get_current (); CosTrading::FollowOption follow_option; - if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("always")) == 0) + if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("always")) == 0) follow_option = CosTrading::always; - else if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("if_no_local")) == 0) + else if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("if_no_local")) == 0) follow_option = CosTrading::if_no_local; - else if (ACE_OS::strcasecmp (arg_str, ACE_LIB_TEXT("local_only")) == 0) + else if (ACE_OS::strcasecmp (arg_str, ACE_TEXT("local_only")) == 0) follow_option = CosTrading::local_only; - else if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("def"))) + else if (ACE_OS::strstr (current_arg, ACE_TEXT("def"))) follow_option = this->def_follow_policy_; else follow_option = this->max_follow_policy_; - if (ACE_OS::strstr (current_arg, ACE_LIB_TEXT("def"))) + if (ACE_OS::strstr (current_arg, ACE_TEXT("def"))) this->def_follow_policy_ = follow_option; else this->max_follow_policy_ = follow_option; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 170b0f5d06f..b225ac9ac5f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -448,13 +448,13 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) const ACE_TCHAR *current_arg = arg_shifter.get_current (); if (ACE_OS::strcmp (current_arg, - ACE_LIB_TEXT("-TSfederate")) == 0) + ACE_TEXT("-TSfederate")) == 0) { arg_shifter.consume_arg (); this->federate_ = 1; } if (ACE_OS::strcmp (current_arg, - ACE_LIB_TEXT("-TSdumpior")) == 0) + ACE_TEXT("-TSdumpior")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) @@ -462,7 +462,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) const ACE_TCHAR *file_name = arg_shifter.get_current (); this->ior_output_file_ = - ACE_OS::fopen (file_name, ACE_LIB_TEXT("w")); + ACE_OS::fopen (file_name, ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -473,7 +473,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) else this->ior_output_file_ = ACE_OS::fdopen (ACE_STDOUT, - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); } else diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp index ca24062c27b..dc4c20b35e7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp @@ -46,7 +46,7 @@ Receiver_Stats::dump_results (const ACE_TCHAR *msg, if (this->samples_count () == 0u) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s : no data collected\n"), msg)); + ACE_TEXT ("%s : no data collected\n"), msg)); return; } @@ -65,7 +65,7 @@ Receiver_Stats::dump_results (const ACE_TCHAR *msg, double l_dev = ACE_CU64_TO_CU32 (dev) / (sf * sf); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), + ACE_TEXT ("%s latency : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), msg, l_min, this->min_at_, l_avg, @@ -73,7 +73,7 @@ Receiver_Stats::dump_results (const ACE_TCHAR *msg, l_dev)); ACE_OS::fprintf (file, - ACE_LIB_TEXT ("Inter Frame Arrival Time Statistics in msecs : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), + ACE_TEXT ("Inter Frame Arrival Time Statistics in msecs : %.2f[%d]/%.2f/%.2f[%d]/%.2f (min/avg/max/var^2)\n"), l_min, this->min_at_, l_avg, l_max, this->max_at_, diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index 7d2ee304899..45874808c2f 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -26,7 +26,7 @@ RtecEventChannelAdmin::EventChannel_ptr get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("hi:n")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n")); int opt; int use_gateway = 1; @@ -50,10 +50,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) case 'h': case '?': ACE_DEBUG((LM_DEBUG, - ACE_LIB_TEXT("Usage: %s ") - ACE_LIB_TEXT("-i ftrt_eventchannel_ior\n") - ACE_LIB_TEXT("-n do not use gateway\n") - ACE_LIB_TEXT("\n"), + ACE_TEXT("Usage: %s ") + ACE_TEXT("-i ftrt_eventchannel_ior\n") + ACE_TEXT("-n do not use gateway\n") + ACE_TEXT("\n"), argv[0])); return 0; } diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 14a770b53be..9033f5b02c2 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -25,7 +25,7 @@ RtecEventChannelAdmin::EventChannel_ptr get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { FtRtecEventChannelAdmin::EventChannel_var channel; - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("hi:nt:?")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?")); int opt; int use_gateway = 1; @@ -51,11 +51,11 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) case 'h': case '?': ACE_DEBUG((LM_DEBUG, - ACE_LIB_TEXT("Usage: %s ") - ACE_LIB_TEXT("-i ftrt_eventchannel_ior\n") - ACE_LIB_TEXT("-n do not use gateway\n") - ACE_LIB_TEXT("-t time Time interval in seconds between events (default 1.0)\n") - ACE_LIB_TEXT("\n"), + ACE_TEXT("Usage: %s ") + ACE_TEXT("-i ftrt_eventchannel_ior\n") + ACE_TEXT("-n do not use gateway\n") + ACE_TEXT("-t time Time interval in seconds between events (default 1.0)\n") + ACE_TEXT("\n"), argv[0])); return 0; diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index 727cdea1fa6..09944124843 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -13,11 +13,11 @@ ACE_TMAIN (int argc, char *argv[]) Notify_Test_Client client; client.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory (); - + NotifyExt::EventChannelFactory_var ecf_ext = NotifyExt::EventChannelFactory::_narrow (ecf); - + ACE_DEBUG((LM_DEBUG, "Destroying ECF...\n")); ecf_ext->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -27,10 +27,10 @@ ACE_TMAIN (int argc, char *argv[]) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Error: \n")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n")); return 1; } ACE_ENDTRY; - + return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp index dda3410e3f6..ce95555bac7 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, char *argv[]) { if (driver.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("Failed to initialize the Notify Testing Driver.\n")), + ACE_TEXT("Failed to initialize the Notify Testing Driver.\n")), 1); driver.run (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -20,7 +20,7 @@ ACE_TMAIN (int argc, char *argv[]) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT("Error: \n")); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n")); return 1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 283b2268fb5..3b46b415d66 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -36,7 +36,7 @@ TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager () int TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name) { - this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_LIB_TEXT("w")); + this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (this->ior_output_file_ == 0) return -1; diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index f220c45d691..4e63d4ba284 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -49,7 +49,7 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT("Error: Exception running command\n")); + ACE_TEXT("Error: Exception running command\n")); } ACE_ENDTRY; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8d035608147..3e761ccd229 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -183,7 +183,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-Timeout")))) // -Timeout timeout_period_S + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Timeout")))) // -Timeout timeout_period_S { if (current_arg != 0) { @@ -192,7 +192,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-IORoutput")))) // -IORoutput file_name + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name { if (this->activation_manager_->ior_output_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -201,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-IORinput")))) // -IORinput file_name + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name { if (this->activation_manager_->ior_input_file (current_arg) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 589911752f2..9e767cc7dad 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -91,7 +91,7 @@ main (int argc, ACE_TCHAR **argv) ACE_TCHAR *ns1ref = 0; ACE_TCHAR *ns2ref = 0; - ACE_Get_Opt get_opts (argc, argv, ACE_LIB_TEXT ("b:d:o:p:q:")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:")); int c; int i; @@ -103,7 +103,7 @@ main (int argc, ACE_TCHAR **argv) if (i<2) { ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); + ACE_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } c_breath = i; @@ -113,7 +113,7 @@ main (int argc, ACE_TCHAR **argv) if (i<2) { ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("Invalid depth, must be 2 or more\n"))); + ACE_TEXT ("Invalid depth, must be 2 or more\n"))); exit(1); } c_depth = i; @@ -123,7 +123,7 @@ main (int argc, ACE_TCHAR **argv) if (i<2) { ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); + ACE_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } o_breath = i; @@ -136,13 +136,13 @@ main (int argc, ACE_TCHAR **argv) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Argument %c \n usage: %s") - ACE_LIB_TEXT (" [-b <breath of context tree>]") - ACE_LIB_TEXT (" [-d <depth of context tree>]") - ACE_LIB_TEXT (" [-o <breath of object tree>]") - ACE_LIB_TEXT (" -p <ior of first name server>") - ACE_LIB_TEXT (" -q <ior of second name server>") - ACE_LIB_TEXT ("\n")), + ACE_TEXT ("Argument %c \n usage: %s") + ACE_TEXT (" [-b <breath of context tree>]") + ACE_TEXT (" [-d <depth of context tree>]") + ACE_TEXT (" [-o <breath of object tree>]") + ACE_TEXT (" -p <ior of first name server>") + ACE_TEXT (" -q <ior of second name server>") + ACE_TEXT ("\n")), -1); } @@ -166,7 +166,7 @@ main (int argc, ACE_TCHAR **argv) if (CORBA::is_nil (ns1obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("invalid ior <%s>\n"), + ACE_TEXT ("invalid ior <%s>\n"), ns1ref), -1); root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in () @@ -182,7 +182,7 @@ main (int argc, ACE_TCHAR **argv) if (CORBA::is_nil (ns2obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("invalid ior <%s>\n"), + ACE_TEXT ("invalid ior <%s>\n"), ns2ref), -1); root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in () @@ -193,7 +193,7 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to resolve name servers")); + ACE_TEXT ("Unable to resolve name servers")); return -1; } ACE_ENDTRY; @@ -234,7 +234,7 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to create a lot of objects")); + ACE_TEXT ("Unable to create a lot of objects")); return -1; } ACE_ENDTRY; @@ -262,7 +262,7 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to create deep context")); + ACE_TEXT ("Unable to create deep context")); return -1; } ACE_ENDTRY; @@ -288,7 +288,7 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to create wide context")); + ACE_TEXT ("Unable to create wide context")); return -1; } ACE_ENDTRY; @@ -321,8 +321,8 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_CHECK_EX(bl_e); if (CORBA::is_nil (result_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving wide context ") - ACE_LIB_TEXT ("- nil object ref.\n")), + ACE_TEXT ("Problems with resolving wide context ") + ACE_TEXT ("- nil object ref.\n")), -1); result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -346,8 +346,8 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_CHECK_EX(bl_e); if (CORBA::is_nil (result_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving deep context ") - ACE_LIB_TEXT ("- nil object ref.\n")), + ACE_TEXT ("Problems with resolving deep context ") + ACE_TEXT ("- nil object ref.\n")), -1); result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -358,7 +358,7 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to delete objects")); + ACE_TEXT ("Unable to delete objects")); return -1; } ACE_ENDTRY; @@ -383,15 +383,15 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_CHECK_EX(bl_f); if (CORBA::is_nil (result_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving object from ") - ACE_LIB_TEXT ("redundant server - nil object ref.\n")), + ACE_TEXT ("Problems with resolving object from ") + ACE_TEXT ("redundant server - nil object ref.\n")), -1); ACE_TRY_CHECK_EX(bl_f); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to resolve object from redundant server")); + ACE_TEXT ("Unable to resolve object from redundant server")); return -1; } ACE_ENDTRY; @@ -410,8 +410,8 @@ main (int argc, ACE_TCHAR **argv) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_g); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving object from ") - ACE_LIB_TEXT ("redundant server - deleted object found.\n")), + ACE_TEXT ("Problems with resolving object from ") + ACE_TEXT ("redundant server - deleted object found.\n")), -1); } ACE_CATCHANY @@ -437,15 +437,15 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_CHECK_EX(bl_h); if (CORBA::is_nil (result_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving wide context from ") - ACE_LIB_TEXT ("redundant server - nil object ref.\n")), + ACE_TEXT ("Problems with resolving wide context from ") + ACE_TEXT ("redundant server - nil object ref.\n")), -1); ACE_TRY_CHECK_EX(bl_h); } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to resolve wide context from redundant server")); + ACE_TEXT ("Unable to resolve wide context from redundant server")); return -1; } ACE_ENDTRY; @@ -463,8 +463,8 @@ main (int argc, ACE_TCHAR **argv) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_i); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving wide context from ") - ACE_LIB_TEXT ("redundant server - deleted object found.\n")), + ACE_TEXT ("Problems with resolving wide context from ") + ACE_TEXT ("redundant server - deleted object found.\n")), -1); } ACE_CATCHANY @@ -488,8 +488,8 @@ main (int argc, ACE_TCHAR **argv) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_j); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving deep context from ") - ACE_LIB_TEXT ("redundant server - deleted object found.\n")), + ACE_TEXT ("Problems with resolving deep context from ") + ACE_TEXT ("redundant server - deleted object found.\n")), -1); } ACE_CATCHANY @@ -518,8 +518,8 @@ main (int argc, ACE_TCHAR **argv) ACE_TRY_CHECK_EX(bl_k); if (CORBA::is_nil (result_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Problems with resolving deep context from ") - ACE_LIB_TEXT ("redundant server - nil object ref.\n")), + ACE_TEXT ("Problems with resolving deep context from ") + ACE_TEXT ("redundant server - nil object ref.\n")), -1); ACE_TRY_CHECK_EX(bl_k); @@ -528,13 +528,13 @@ main (int argc, ACE_TCHAR **argv) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_LIB_TEXT ("Unable to resolve deep context from redundant server")); + ACE_TEXT ("Unable to resolve deep context from redundant server")); return -1; } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Redundancy test OK\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Redundancy test OK\n"))); return 0; } diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 82df3fb4baf..a65f0a25f07 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -308,8 +308,8 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("\nTAO (%P|%t) TAO_CORBALOC_Parser: ") - ACE_LIB_TEXT ("Invalid IPv6 decimal address specified.\n"))); + ACE_TEXT ("\nTAO (%P|%t) TAO_CORBALOC_Parser: ") + ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } separator = 0; } diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index e7efe13f2ed..e2c3957dde0 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -238,8 +238,8 @@ TAO_IIOP_Connection_Handler::close_connection (void) if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) Unable to set ") - ACE_LIB_TEXT ("SO_LINGER on %d\n"), + ACE_TEXT ("TAO (%P|%t) Unable to set ") + ACE_TEXT ("SO_LINGER on %d\n"), this->peer ().get_handle ())); } } diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index f7dac697e7e..63386a97991 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -152,8 +152,8 @@ TAO_IIOP_Profile::parse_string_i (const char *ior if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") - ACE_LIB_TEXT ("Invalid IPv6 decimal address specified.\n"))); + ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") + ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } ACE_THROW (CORBA::INV_OBJREF ( @@ -180,8 +180,8 @@ TAO_IIOP_Profile::parse_string_i (const char *ior if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") - ACE_LIB_TEXT ("Host address may be omited only when no port has been specified.\n"))); + ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ") + ACE_TEXT ("Host address may be omited only when no port has been specified.\n"))); } ACE_THROW (CORBA::INV_OBJREF ( diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 523c7085c96..ca15968544d 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -383,8 +383,8 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("\nTAO (%P|%t) MCAST_Parser: ") - ACE_LIB_TEXT ("Invalid IPv6 decimal address specified.\n"))); + ACE_TEXT ("\nTAO (%P|%t) MCAST_Parser: ") + ACE_TEXT ("Invalid IPv6 decimal address specified.\n"))); } return; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 0fde05c0663..a17930050e6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -386,7 +386,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBNoServerSideNameLookups")))) + (ACE_TEXT("-ORBNoServerSideNameLookups")))) { // Don't look up the host name for incoming connections no_server_side_name_lookups = @@ -753,7 +753,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBIMREndpointsInIOR")))) + (ACE_TEXT("-ORBIMREndpointsInIOR")))) { this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg); @@ -789,7 +789,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBLingerTimeout")))) + (ACE_TEXT("-ORBLingerTimeout")))) { linger = ACE_OS::atoi (current_arg); @@ -878,7 +878,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1); } else if ((current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBUseSharedProfile")))) + (ACE_TEXT("-ORBUseSharedProfile")))) { this->orb_params ()->shared_profile (ACE_OS::atoi (current_arg)); @@ -886,7 +886,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } else if ((current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBNegotiateCodesets")))) + (ACE_TEXT("-ORBNegotiateCodesets")))) { negotiate_codesets = (ACE_OS::atoi (current_arg)); diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 2a3d5e5d292..8d3fe4a00e7 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -201,7 +201,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) } } else if (ACE_OS::strcmp (argv[curarg], - ACE_LIB_TEXT("-ORBConnectionHandlerCleanup")) == 0) + ACE_TEXT("-ORBConnectionHandlerCleanup")) == 0) { curarg++; if (curarg < argc) diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index 093073beeb9..c9040934c2a 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -155,11 +155,11 @@ main (int argc, char *argv[]) if (freq != 919263) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ERROR in the test \n"))); + ACE_TEXT ("(%P|%t) ERROR in the test \n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) Shutting server down \n"))); + ACE_TEXT ("(%P|%t) Shutting server down \n"))); server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; |