From 21105e3d60d22e1d8ee9557f2bbd5240c4ee6395 Mon Sep 17 00:00:00 2001 From: giovannd Date: Tue, 13 Dec 2005 22:55:00 +0000 Subject: *** empty log message *** --- TAO/examples/Advanced/ch_3/client.cpp | 2 +- TAO/examples/Content_Server/AMI_Iterator/client.cpp | 3 +-- TAO/examples/Content_Server/AMI_Observer/client.cpp | 3 +-- TAO/examples/Content_Server/SMI_Iterator/client.cpp | 4 ++-- TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp | 2 +- TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h | 4 ++-- TAO/examples/Load_Balancing/Identity_Server.cpp | 2 +- TAO/examples/Load_Balancing_persistent/Identity_Client.cpp | 2 +- TAO/examples/Load_Balancing_persistent/Identity_Server.cpp | 2 +- .../Load_Balancing_persistent/Load_Balancing_Service.cpp | 2 +- TAO/examples/Logging/Logger_i.cpp | 8 ++++---- TAO/examples/POA/Forwarding/server.cpp | 2 +- TAO/examples/POA/Loader/Servant_Activator.cpp | 6 +++--- TAO/examples/POA/Loader/Servant_Locator.cpp | 6 +++--- TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp | 4 ++-- TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp | 4 ++-- TAO/examples/Persistent_Grid/Grid_i.cpp | 2 +- TAO/examples/Persistent_Grid/server.cpp | 4 ++-- TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp | 2 +- .../PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp | 2 +- TAO/examples/Quoter/Generic_Factory.cpp | 4 ++-- TAO/examples/Quoter/client.cpp | 4 ++-- TAO/examples/RTCORBA/Activity/Activity.cpp | 2 +- TAO/examples/RTCORBA/Activity/Periodic_Task.cpp | 2 +- TAO/examples/RTCORBA/Activity/Periodic_Task.h | 2 +- TAO/examples/RTCORBA/Activity/Task_Stats.cpp | 10 +++++----- TAO/examples/RTCORBA/Activity/Task_Stats.h | 4 ++-- .../RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp | 2 +- TAO/examples/RTScheduling/Task_Stats.cpp | 2 +- TAO/examples/RTScheduling/Task_Stats.h | 4 ++-- TAO/examples/Simple/bank/server.cpp | 3 +-- TAO/examples/Simple/echo/client.cpp | 4 ++-- TAO/examples/Simple/echo/server.cpp | 4 ++-- TAO/examples/Simple/grid/server.cpp | 4 ++-- TAO/examples/Simple/time-date/server.cpp | 2 +- TAO/examples/Simple/time/server.cpp | 4 ++-- TAO/examples/ior_corbaloc/corbaname_client.cpp | 2 +- TAO/examples/ior_corbaloc/server.cpp | 2 +- 38 files changed, 62 insertions(+), 65 deletions(-) diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp index 05ac881a6a6..8a934637a70 100644 --- a/TAO/examples/Advanced/ch_3/client.cpp +++ b/TAO/examples/Advanced/ch_3/client.cpp @@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv()); // Destringify argv[1] - CORBA::Object_var obj = orb->string_to_object (argv[1]); + CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]); if (CORBA::is_nil (obj.in ())) { cerr << "Nil Time reference" << endl; diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 3b691eddb3b..6699b86e461 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -80,8 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // completed. int request_count = 0; - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 08e8295b948..a8d56209ce8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -81,8 +81,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int request_count = 0; // Activate and run the reply handlers. - ::invoke_requests (argc, - argv, + ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(), &request_count, factory.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index 3476e624386..7a1e2504d21 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -92,7 +92,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // Get a Content_Iterator - const char *pathname = argv[1]; + const char *pathname = convert.get_ASCII_argv()[1]; Web_Server::Content_Iterator_var contents; Web_Server::Metadata_Type_var metadata; factory->get_iterator (pathname, @@ -211,7 +211,7 @@ int retrieve_data (const char *content_type, // Now spawn a view to display the retrieved data. if (::spawn_viewer (content_type, - file_addr.get_path_name ()) != 0) + ACE_TEXT_TO_CHAR_IN(file_addr.get_path_name ())) != 0) return -1; return 0; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index ffb3c4f87bc..0db393b8ce1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -57,7 +57,7 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h index f3d7d4a300f..6519e30c942 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h @@ -61,10 +61,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index b72f1b57ef4..ef03f6c6357 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -167,7 +167,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index cd3286b0e06..0dae720f4ca 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -89,7 +89,7 @@ Identity_Client::init (int argc, return result; // Check the non-ORB arguments. - result = this->parse_args (convert.get_argc(), convert.get_ASCII_argv()); + result = this->parse_args (argc, argv); if (result < 0) return result; } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 7b0881163b4..f07a86b7a2b 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -209,7 +209,7 @@ Identity_Server::create_objects (size_t number_of_objects, // Create an id for this servant. char id[BUFSIZ]; ACE_OS::sprintf (id, - "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER, + "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A, i); // Create and activate a servant. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index 372e7b6078c..62374de6938 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -78,7 +78,7 @@ Load_Balancing_Service::init (int argc, return result; // Check the non-ORB arguments. - result = this->parse_args (convert.get_argc(), convert.get_ASCII_argv()); + result = this->parse_args (argc, argv); if (result < 0) return result; diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 1e425fbd119..4499989e881 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -151,7 +151,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, // Create a temporary buffer for manipulating the logging message, // adding additional space for formatting characters.. - ACE_TCHAR msgbuf [ACE_MAXLOGMSGLEN + 4]; + char msgbuf [ACE_MAXLOGMSGLEN + 4]; // Format the message for proper display. ACE_OS::strcpy (msgbuf, "::"); @@ -162,7 +162,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, ACE_MAXLOGMSGLEN); // Set to the value stored in . - rec.msg_data (msgbuf); + rec.msg_data (ACE_TEXT_TO_TCHAR_IN(msgbuf)); CORBA::Long addr = log_rec.host_addr; @@ -172,13 +172,13 @@ Logger_i::logv (const Logger::Log_Record &log_rec, static_cast (addr)); // Create a buffer and fill it with the host name of the logger - ACE_TCHAR namebuf[MAXHOSTNAMELEN + 1]; + char namebuf[MAXHOSTNAMELEN + 1]; ACE_OS::strncpy (namebuf, addy.get_host_addr (), MAXHOSTNAMELEN); u_long verb_level = this->verbosity_conversion (verbosity); - rec.print (namebuf, + rec.print (ACE_TEXT_TO_TCHAR_IN(namebuf), verb_level, stderr); // Print out the logging message to stderr with the given level of diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index 3681d2018bc..d10cdd520d3 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -177,7 +177,7 @@ create_servant_manager (CORBA::ORB_ptr orb, int ACE_TMAIN (int argc, - char **argv) + ACE_TCHAR **argv) { ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index 72bf969c798..077b016cab6 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -36,7 +36,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p\n", this->dll_.error ())); @@ -46,7 +46,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast (symbol); servant_supplier_ = @@ -54,7 +54,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast (symbol); servant_garbage_collector_ = reinterpret_cast (function); diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index 3850c8743ce..d2e154105b1 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -36,7 +36,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)) { // The dll is opened using the dllname passed. - if (this->dll_.open (dllname) == -1) + if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1) ACE_ERROR ((LM_ERROR, "%p", this->dll_.error ())); @@ -48,7 +48,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. // - void *symbol = this->dll_.symbol (factory_function); + void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function)); long function = reinterpret_cast (symbol); servant_supplier_ = @@ -56,7 +56,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. - symbol = this->dll_.symbol (garbage_collection_function); + symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function)); function = reinterpret_cast (symbol); servant_garbage_collector_ = diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index 7f6dfca8f25..50321c85844 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -69,7 +69,7 @@ ServantManager_i::obtain_servant (const char *str, "Bind failed"), 0); // Now that the dll name is available we open the dll. - if (dll->open (dllname_.c_str ()) == -1) + if (dll->open (ACE_TEXT_TO_TCHAR_IN(dllname_.c_str ())) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p", dll->error ()), @@ -80,7 +80,7 @@ ServantManager_i::obtain_servant (const char *str, // Cannot go from void* to function pointer directly. Cast the void* // to long first. - void *symbol = dll->symbol (create_symbol_.c_str ()); + void *symbol = dll->symbol (ACE_TEXT_TO_TCHAR_IN(create_symbol_.c_str ())); long function = reinterpret_cast (symbol); SERVANT_FACTORY servant_creator = diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index bfd11c30f66..8e4724ef153 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -118,12 +118,12 @@ Server_i::init (int argc, char **argv) ACE_TRY { // Initialize the ORB. - orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); + int result = parse_args (argc, argv); if (result != 0) return result; diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index fcec899cc6e..7e3951da107 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -185,7 +185,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, // Get a memory pool ACE_NEW_THROW_EX (pool_t_, - pool_t (pool_name_), + pool_t (ACE_TEXT_TO_TCHAR_IN(pool_name_)), CORBA::NO_MEMORY ()); // pool_t_ = new pool_t (pool_name_); diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 559897d1175..1debd6b942a 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -20,8 +20,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 882b5078c5d..1b0da8ea299 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -32,7 +32,7 @@ UDP_Client_i::svc (void) { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast (ACE_OS::getpid ())); diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 77db4ccca0e..dfce99289c6 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -35,7 +35,7 @@ UDP_PerformanceClient::svc () { ACE_CString client_name ("UDP"); - ACE_TCHAR pid[256]; + char pid[256]; ACE_OS::sprintf (pid, "%u", static_cast (ACE_OS::getpid ())); diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index 746472da271..0c68c46d822 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -286,8 +286,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { - if (quoter_Generic_Factory_Server.init (argc, - argv + if (quoter_Generic_Factory_Server.init (convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 4ec6b9adfa1..1d3482cacd6 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -382,8 +382,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) - threads = ACE_OS::atoi(argv[i + 1]); + if (ACE_OS::strcmp (convert.get_ASCII_argv()[i], "-n") == 0) + threads = ACE_OS::atoi(convert.get_ASCII_argv()[i + 1]); Quoter_Task **clients = new Quoter_Task*[threads]; diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index ab320dd1637..8720611ff4e 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -407,7 +407,7 @@ Activity::create_started_flag_file (int argc, char *argv[]) while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag")))) + if ((current_arg = arg_shifter.get_the_parameter ("-Started_Flag"))) { FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w")); diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp index c811ed9f8a2..870fac04ecc 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp @@ -101,7 +101,7 @@ Periodic_Task::job (Job_ptr job) } void -Periodic_Task::dump_stats (ACE_TCHAR* msg) +Periodic_Task::dump_stats (char* msg) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s%s", name_.c_str (),".dat"); diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index 28e9733e9a5..a82180a1adf 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -44,7 +44,7 @@ class activity_Export Periodic_Task : public ACE_Task virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping) = 0; /// Dump the stats collected. - void dump_stats (ACE_TCHAR* msg); + void dump_stats (char* msg); /// = Job get/set /// Returns the name of the Job exec'ed by this Task. diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index a2974b08626..1ef20b42e0b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -55,7 +55,7 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor) { FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); @@ -67,7 +67,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, // calc throughput. - ACE_TCHAR out_msg[BUFSIZ]; + char out_msg[BUFSIZ]; ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor; double elapsed_seconds = @@ -99,12 +99,12 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } void -Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) +Task_Stats::dump_latency_stats (char *out_msg, ACE_UINT32 sf) { if (this->samples_count_ == 0u) { ACE_OS::sprintf (out_msg, - ACE_TEXT ("# no data collected\n")); + "# 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_TEXT ("#latency : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"), + "#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_, diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h index 8252c071c89..dcfb00a145b 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.h +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h @@ -61,10 +61,10 @@ class activity_Export Task_Stats /// Record a sample int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 5019ee6ae5d..9b874cefd04 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -213,7 +213,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf char msg [BUFSIZ]; ACE_OS::sprintf (msg, "The Guid is " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", gu_id); DT_TEST::instance ()->dt_creator ()->log_msg (msg); diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index ac7ebb1c3ab..c3078316775 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -57,7 +57,7 @@ Task_Stats::end_time (ACE_hrtime_t time) } void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, +Task_Stats::dump_samples (const char *file_name, const char *msg, ACE_UINT32) { diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h index b32f1041bfc..e76f669562f 100644 --- a/TAO/examples/RTScheduling/Task_Stats.h +++ b/TAO/examples/RTScheduling/Task_Stats.h @@ -60,10 +60,10 @@ class Task_Stats /// Record a sample int sample (ACE_UINT32 thr_run_time, int thr_count); - void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, + void dump_samples (const char *file_name, const char *msg, ACE_UINT32 scale_factor); protected: - void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf); + void dump_latency_stats (char *out_msg, ACE_UINT32 sf); /// Base and end times ACE_hrtime_t base_time_; diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index 344f9a0fa35..e3742560466 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -17,8 +17,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY_NEW_ENV { if (server.init ("Bank", - argc, - argv + convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/echo/client.cpp b/TAO/examples/Simple/echo/client.cpp index b46a6fa80f1..e684030e64e 100644 --- a/TAO/examples/Simple/echo/client.cpp +++ b/TAO/examples/Simple/echo/client.cpp @@ -15,8 +15,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) "\nEcho client\n\n")); if (client.run ("Echo", - argc, - argv) == -1) + convert.get_argc(), + convert.get_ASCII_argv()) == -1) return -1; else return 0; diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index b7f3319b4f3..1d10849bf82 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -19,8 +19,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { if (server.init ("Echo", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 925e1ecfffd..4f871176f8c 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -19,8 +19,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { if (server.init ("Grid", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp index 4f7c3ce38ae..11282eacc7a 100644 --- a/TAO/examples/Simple/time-date/server.cpp +++ b/TAO/examples/Simple/time-date/server.cpp @@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter convert (argc, argv); - if (ACE_Service_Config::open (convert.get_argc(), convert.get_ASCII_argv()) == -1 + if (ACE_Service_Config::open (convert.get_argc(), convert.get_TCHAR_argv()) == -1 && errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index 7940dbe829b..22587e72d04 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -19,8 +19,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TRY { if (server.init ("Time", - argc, - argv + convert.get_argc(), + convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER) == -1) return 1; else diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 7eea89b44cb..0ad26d5ee23 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -40,7 +40,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Get an object reference using a corbaname: style URL CORBA::Object_var obj = - orb->string_to_object (argv[1] + orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index c5e325791c8..fcf73639625 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -46,7 +46,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) // Create the servant corbaloc_Status_i status_i; - status_i.set_name (argv[1]); + status_i.set_name (convert.get_ASCII_argv()[1]); // Activate it to obtain the reference corbaloc::Status_var status = status_i._this (); -- cgit v1.2.1