diff options
| author | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-13 14:37:14 +0000 |
|---|---|---|
| committer | giovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-12-13 14:37:14 +0000 |
| commit | cbbb994dc2d5e8df77bfa4bbe6abe837d3312944 (patch) | |
| tree | bbcae289834d6029e89823dd4f9d08a4eb182b56 | |
| parent | 59011ad5857e24786aad1d50d9ce683ab4d82f12 (diff) | |
| download | ATCD-cbbb994dc2d5e8df77bfa4bbe6abe837d3312944.tar.gz | |
ACE_TEXT, more orbsrvs, args, maketemp fix
91 files changed, 641 insertions, 348 deletions
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index a777b02c4ee..80fa9bc722f 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -683,7 +683,7 @@ FE_populate (void) void FE_store_env_include_paths (void) { - ACE_Env_Value<char*> incl_paths (ACE_LIB_TEXT("INCLUDE"), + ACE_Env_Value<char*> incl_paths (ACE_TEXT("INCLUDE"), (char *) 0); const char *aggr_str = incl_paths; @@ -713,7 +713,7 @@ FE_get_cpp_loc_from_env (void) const char *cpp_loc = 0; // See if TAO_IDL_PREPROCESSOR is defined. - ACE_Env_Value<char*> preprocessor (ACE_LIB_TEXT("TAO_IDL_PREPROCESSOR"), + ACE_Env_Value<char*> preprocessor (ACE_TEXT("TAO_IDL_PREPROCESSOR"), (char *) 0); // Set cpp_loc to the built in location, unless it has been overriden by @@ -725,7 +725,7 @@ FE_get_cpp_loc_from_env (void) else { // Check for the deprecated CPP_LOCATION environment variable - ACE_Env_Value<char*> cpp_path (ACE_LIB_TEXT("CPP_LOCATION"), + ACE_Env_Value<char*> cpp_path (ACE_TEXT("CPP_LOCATION"), (char *) 0); if (cpp_path != 0) @@ -753,7 +753,7 @@ FE_get_cpp_args_from_env (void) const char *cpp_args = 0; // Added some customizable preprocessor options - ACE_Env_Value<char*> args1 (ACE_LIB_TEXT("TAO_IDL_PREPROCESSOR_ARGS"), + ACE_Env_Value<char*> args1 (ACE_TEXT("TAO_IDL_PREPROCESSOR_ARGS"), (char *) 0); if (args1 != 0) @@ -764,7 +764,7 @@ FE_get_cpp_args_from_env (void) { // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment // variable. - ACE_Env_Value<char*> args2 (ACE_LIB_TEXT("TAO_IDL_DEFAULT_CPP_FLAGS"), + ACE_Env_Value<char*> args2 (ACE_TEXT("TAO_IDL_DEFAULT_CPP_FLAGS"), (char *) 0); if (args2 != 0) diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index d7d06da76fd..676dfdf7b91 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -60,7 +60,7 @@ void Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, ACE_UINT32) { - FILE* output_file = ACE_OS::fopen (file_name, "w"); + FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); if (output_file == 0) { diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 6389a04c776..62afdc4ba28 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -635,8 +635,8 @@ Object_Group_i::bind (const Load_Balancer::Member & member this->allocator_) == 0) ACE_THROW (Load_Balancer::duplicate_member ()); - size_t id_len = ACE_OS::strlen (member.id) + 1; - size_t ref_len = ACE_OS::strlen (member.obj) + 1; + size_t id_len = ACE_OS::strlen (member.id.in()) + 1; + size_t ref_len = ACE_OS::strlen (member.obj.in()) + 1; char *mem_alloc = (char *)this->allocator_->malloc (id_len + ref_len); diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 5b333145f0b..8e5d263de0b 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -23,9 +23,9 @@ class POA_Holder; #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" class Activity; -class ACE_Arg_Shifter; typedef POA_Holder** POA_LIST; typedef Periodic_Task** TASK_LIST; diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 563abde30ed..d1b4ceaa3e2 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -16,8 +16,7 @@ #include "JobS.h" #include "activity_export.h" #include "ace/SString.h" - -class ACE_Arg_Shifter; +#include "ace/Arg_Shifter.h" /** * @class Job_i diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index 81a850a323c..cce1b948364 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -17,8 +17,7 @@ #include "tao/PortableServer/PortableServer.h" #include "activity_export.h" #include "ace/SString.h" - -class ACE_Arg_Shifter; +#include "ace/Arg_Shifter.h" /** * @class POA_Holder diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h index 6fb89649ab3..aaf8e9db014 100644 --- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h +++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h @@ -19,9 +19,9 @@ #include "ace/SString.h" #include "JobC.h" #include "activity_export.h" +#include "ace/Arg_Shifter.h" class ACE_Barrier; -class ACE_Arg_Shifter; class Task_Stats; /** diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 7aa0756f128..acf9febe00c 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -16,8 +16,8 @@ #include "JobS.h" #include "Task_Stats.h" #include "ace/SString.h" +#include "ace/Arg_Shifter.h" -class ACE_Arg_Shifter; class DT_Creator; /** diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h index d92dabfe616..92a15b22ea4 100644 --- a/TAO/examples/RTScheduling/POA_Holder.h +++ b/TAO/examples/RTScheduling/POA_Holder.h @@ -19,8 +19,7 @@ #include "tao/PortableServer/PortableServer.h" //#include "activity_export.h" #include "ace/SString.h" - -class ACE_Arg_Shifter; +#include "ace/Arg_Shifter.h" /** * @class POA_Holder diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index e92a2366500..e4122801d77 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -147,7 +147,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[]) TAO_debug_level++; break; case 'o': // output the IOR to a file. - this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w"); + this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w")); if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index b2a3df859b7..f61db5d51dd 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -137,7 +137,7 @@ Logging_Supplier::load_schedule_data FILE *input_file; int scan_count = 0; - input_file = ACE_OS::fopen(this->input_file_name_, "r"); + input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r")); if (input_file) { diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index a9f068ed523..7f454c63773 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -285,7 +285,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "activate" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; @@ -317,7 +317,7 @@ int TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) { // Skip the "autostart" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); int c; @@ -362,7 +362,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "ior" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("hf:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hf:")); this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); if (this->server_name_.length() == 0 || this->server_name_[0] == '-') @@ -418,7 +418,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "list" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("vh"), server_flag); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("vh"), server_flag); int c; @@ -462,7 +462,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "remove" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; @@ -504,7 +504,7 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "shutdown" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("h")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h")); this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; @@ -551,7 +551,7 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "shutdown-repo" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("ha")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("ha")); int c; @@ -582,7 +582,7 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt) // Increase the length of the sequence this->environment_vars_.length (length + 1); ACE_TString tokens (opt); - int index = tokens.find (ACE_LIB_TEXT("=")); + int index = tokens.find (ACE_TEXT("=")); // Insert at position length since that is our new element this->environment_vars_ [length].name = CORBA::string_dup (tokens.substr (0, index).c_str ()); @@ -621,7 +621,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "update" command - ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_LIB_TEXT("hc:w:a:e:r:R:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hc:w:a:e:r:R:l:")); this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1])); int c; diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index 57c91871ba3..230991db3df 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -80,7 +80,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) const char* ior_file_name = "Consumer.ior"; FILE *output_file= ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(ior_file_name), - 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/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index bc2fbf8af99..0563ba518bb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -230,7 +230,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, if (pid_file != 0) { - FILE *pidf = ACE_OS::fopen (pid_file, ACE_LIB_TEXT("w")); + FILE *pidf = ACE_OS::fopen (pid_file, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, @@ -359,7 +359,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 ()); @@ -369,7 +369,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, if (pid_file != 0) { - FILE *pidf = ACE_OS::fopen (pid_file, ACE_LIB_TEXT("w")); + FILE *pidf = ACE_OS::fopen (pid_file, ACE_TEXT("w")); if (pidf != 0) { ACE_OS::fprintf (pidf, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 1ff9bd11422..9e6b48d3f06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -117,7 +117,7 @@ AMI_Primary_Replication_Strategy::replicate_request( size_t num_backups = backups.length(); if ((size_t)transaction_depth > num_backups) { - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } @@ -164,7 +164,7 @@ AMI_Primary_Replication_Strategy::replicate_request( } ACE_ENDTRY; } - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 93d38b822cf..4068101a592 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -43,7 +43,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) // client_interceptor_->sequence_num_--; FTRT::OutOfSequence exception; exception.current = this->sequence_num_; - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_); ACE_THROW(FTRT::OutOfSequence(exception)); } else @@ -90,7 +90,7 @@ Basic_Replication_Strategy::replicate_request( if (info_publisher->is_primary()) this->sequence_num_++; - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("replicate_request : sequence no = %d\n"), sequence_num_); + TAO_FTRTEC::Log(1, ACE_TEXT("replicate_request : sequence no = %d\n"), sequence_num_); Request_Context_Repository().set_sequence_number(sequence_num_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -112,7 +112,7 @@ Basic_Replication_Strategy::replicate_request( } } else if (transaction_depth > 1) { - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 9f759c7a90d..2057cf72ad7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -76,7 +76,7 @@ void TAO_FTEC_Group_Manager::create_group ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("create_group\n")); + TAO_FTRTEC::Log(1, ACE_TEXT("create_group\n")); impl_->info_list = info_list; impl_->my_position = find_by_location(info_list, @@ -116,7 +116,7 @@ void TAO_FTEC_Group_Manager::join_group ( const FTRT::ManagerInfo & info ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("join group\n")); + TAO_FTRTEC::Log(1, ACE_TEXT("join group\n")); if (impl_->my_position == 0) { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); @@ -130,7 +130,7 @@ void TAO_FTEC_Group_Manager::add_member ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("add_member location = <%s>\n"), + TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"), (const char*)info.the_location[0].id); auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); @@ -244,7 +244,7 @@ void TAO_FTEC_Group_Manager::add_member ( object_group_ref_version ACE_ENV_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(2, ACE_LIB_TEXT("After create_group\n")); + TAO_FTRTEC::Log(2, ACE_TEXT("After create_group\n")); } // commit the changes @@ -268,7 +268,7 @@ void TAO_FTEC_Group_Manager::replica_crashed ( const FTRT::Location & location ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n")); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n")); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); remove_member(location, IOGR_Maker::instance()->get_ref_version()+1 @@ -318,14 +318,14 @@ void TAO_FTEC_Group_Manager::remove_member ( ACE_ENDTRY; } - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos); + TAO_FTRTEC::Log(3, ACE_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos); if (impl_->my_position == crashed_pos && impl_->my_position > 0) Fault_Detector::instance()->connect(impl_->info_list[impl_->my_position-1].the_location); } void TAO_FTEC_Group_Manager::connection_closed() { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("TAO_FTEC_Group_Manager::connection_closed\n")); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::connection_closed\n")); ACE_ASSERT(impl_->my_position > 0); // do not use referere here, because the the value pointed by the pointer to diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 2818f3bfa67..dd523803cd6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -190,7 +190,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Current GROUP Version = %d, received version = %d\n"), + TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"), maker->get_ref_version(), version); if (version < maker->get_ref_version()) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 7b66341afe2..eed535d3292 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -222,7 +222,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp(operation.in(), "push") == 0) { - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Received push command\n")); + TAO_FTRTEC::Log(3, ACE_TEXT("Received push command\n")); return; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 12426a85347..ed7ad362aeb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -152,7 +152,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) } if (!CORBA::is_nil(naming_context_.in())) { - TAO_FTRTEC::Log(1, ACE_LIB_TEXT("Registering to the Name Service\n")); + TAO_FTRTEC::Log(1, ACE_TEXT("Registering to the Name Service\n")); ACE_TRY_NEW_ENV { naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(), info->iogr.in() ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index c2b50e1423f..12ced50ab33 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -107,7 +107,7 @@ namespace FTRTEC void Replication_Service::become_primary() { - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("become_primary\n")); + TAO_FTRTEC::Log(3, ACE_TEXT("become_primary\n")); Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); @@ -169,21 +169,21 @@ namespace FTRTEC int Replication_Service::acquire_read (void) { int r = replication_strategy->acquire_read(); - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Read Lock acquired %d\n"), r); + TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } int Replication_Service::acquire_write (void) { int r= replication_strategy->acquire_write(); - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Write Lock acqured %d\n"), r); + TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } int Replication_Service::release (void) { int r= replication_strategy->release(); - TAO_FTRTEC::Log(3, ACE_LIB_TEXT("Lock Released %d\n"), r); + TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); return r; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index d33f194f9be..1a4a24f328a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -711,7 +711,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char * ior) { int result = -1; - FILE* out = ACE_OS::fopen (outputFile, ACE_LIB_TEXT("w")); + FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w")); if (out) { ACE_OS::fprintf (out, "%s", ior); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 73bb93f73b6..4a5881deaaa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -103,7 +103,7 @@ Receiver_Callback::dump_samples (const char* file) stats_.sample ((ACE_UINT64)stats [i]); } - stats_.dump_results ("Inter Frame Arrival Time Statistics ", + stats_.dump_results (ACE_TEXT("Inter Frame Arrival Time Statistics "), stats_file, 1); // ACE_High_Res_Timer::global_scale_factor ()); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 01c983a1320..47eb97831e9 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -446,8 +446,8 @@ int run_abort_test (Simple_Server_ptr server, if (ACE_OS::strcmp (expected, received)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("... FAIL\n" - "CLIENT> received: '%s'\n"), + ACE_TEXT ("... FAIL\n") + ACE_TEXT ("CLIENT> received: '%s'\n"), received)); return -1; } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 7422dedd82e..6b58f67c9ce 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -531,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL) else { ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** " - ACE_SIZE_T_FORMAT_SPECIFIER + ACE_SIZE_T_FORMAT_SPECIFIER_A "\n", this->replica_pos_); } return result; @@ -630,7 +630,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Argv_Type_Converter convert (argc, argv); FTClientMain app; - int result = app.parse_args(argc, argv); + int result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv()); if (result == 0) { ACE_TRY_NEW_ENV diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index d1b945e5d61..04b218fd78e 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index 98bac03c3cd..33d5a850b02 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -136,7 +136,7 @@ Latency_Query_Client::run (void) if (this->do_dump_history_) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp index ce1c5d549d6..e348c77a2d3 100644 --- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp +++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp @@ -61,7 +61,7 @@ namespace { } void setUp() { - ACE_ARGV av; + ACE_TARGV<char> av; int ac = 0; orb = ORB_init(ac, av.argv()); ACE_ASSERT(! is_nil(orb.in())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 3874066e3ff..757baa0e912 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -204,7 +204,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (sup_iter.next (sup_entry) != 0) { supplier = sup_entry->int_id_; - supplier->dump_stats (msg, dump_samples); + supplier->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } @@ -219,7 +219,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) if (cons_iter.next (cons_entry) != 0) { consumer = cons_entry->int_id_; - consumer->dump_stats (msg, dump_samples); + consumer->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); } } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 684ea59c128..65bb861b615 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -20,13 +20,13 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::get_name (void) { return TAO_Notify_Tests_Application_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Application_Command::name (void) { return TAO_Notify_Tests_Name::application_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index 67746f13f3b..89902c795e6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -46,8 +46,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: #ifdef HPUX_11 diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 3b31614d141..c77c5c9655b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -19,7 +19,7 @@ TAO_Notify_Tests_Command::~TAO_Notify_Tests_Command () } void -TAO_Notify_Tests_Command::init (ACE_TArg_Shifter< char >& /*arg_shifter*/) +TAO_Notify_Tests_Command::init (ACE_TArg_Shifter< ACE_TCHAR >& /*arg_shifter*/) { // default: do nothing. } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 739188699d8..20b77126569 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -45,16 +45,16 @@ public: virtual ~TAO_Notify_Tests_Command (); /// Parse args and populate options. - virtual void init (ACE_TArg_Shifter< char >& arg_shifter); + virtual void init (ACE_TArg_Shifter< ACE_TCHAR >& arg_shifter); /// Implement command execution. virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Return the name of this command. - virtual const char* get_name (void)= 0; + virtual const ACE_TCHAR* get_name (void)= 0; ///= Each derived type must also implement the following signature: - // static const char* name (void); + // static const ACE_TCHAR* name (void); protected: /// Next command after this one. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index 93d067000bf..0a412cfe89d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -20,11 +20,11 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder () } int -TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[]) +TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[]) { - ACE_TArg_Shifter< char > arg_shifter (argc, argv); + ACE_TArg_Shifter< ACE_TCHAR > arg_shifter (argc, argv); - ACE_CString current_arg; + ACE_TString current_arg; TAO_Notify_Tests_Command_Factory* factory = 0; if (arg_shifter.is_anything_left ()) @@ -66,7 +66,7 @@ TAO_Notify_Tests_Command_Builder::fini (void) } void -TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) +TAO_Notify_Tests_Command_Builder::_register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory) { if (this->factory_map_.bind (command_factory_name, command_factory) == -1) ACE_DEBUG ((LM_DEBUG, "Failed to register command factory for %s\n", command_factory_name.c_str ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index 7ca63765dbe..a29bd93e7d3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -46,11 +46,11 @@ public: ~TAO_Notify_Tests_Command_Builder (); /// = Service_Object virtual method overloads. - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int fini (void); /// Register the factory against the name of the factory. - void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); + void _register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); /// Execute the <start_command_>. void execute (ACE_ENV_SINGLE_ARG_DECL); @@ -63,7 +63,7 @@ protected: TAO_Notify_Tests_Command* last_command_; /// The factory map. - ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; + ACE_Hash_Map_Manager <ACE_TString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder) diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 1bae181df50..6846f60c64c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -17,13 +17,13 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void) { return TAO_Notify_Tests_ConsumerAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_ConsumerAdmin_Command::name (void) { return TAO_Notify_Tests_Name::consumer_admin_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index 89469f27047..dcc6b8aeea2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -45,8 +45,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 86ce3f339de..c8689505bdb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -228,10 +228,10 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) int TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - ACE_Argv_Type_Converter command_line(argc, argv); + ACE_Argv_Type_Converter convert(argc, argv); - this->orb_ = CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index d92b3f6a36d..8e2a2a1b596 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -20,13 +20,13 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::get_name (void) { return TAO_Notify_Tests_EventChannel_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_EventChannel_Command::name (void) { return TAO_Notify_Tests_Name::event_channel_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 1de43ed107d..30843f6b0e7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -48,8 +48,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 0a371bd6d0f..404e401f706 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -16,13 +16,13 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command () { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::get_name (void) { return TAO_Notify_Tests_Filter_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Filter_Command::name (void) { return TAO_Notify_Tests_Name::filter_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 0da50304fd4..24d1b9dfb43 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -45,8 +45,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index 6a887d34c56..532fa99954a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -5,33 +5,36 @@ ACE_RCSID(lib, TAO_Name, "$Id$") #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ +const ACE_TCHAR* const TAO_Notify_Tests_Name::target = name; + +#define TAO_Notify_Tests_DECLARE_NAME_A(target, name) \ const char* const TAO_Notify_Tests_Name::target = name; -TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder") -TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA") -TAO_Notify_Tests_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory") -TAO_Notify_Tests_DECLARE_NAME (naming_service,"NameService") +TAO_Notify_Tests_DECLARE_NAME (command_builder, ACE_TEXT("Command_Builder")) +TAO_Notify_Tests_DECLARE_NAME_A (root_poa, "RootPOA") +TAO_Notify_Tests_DECLARE_NAME_A (event_channel_factory, "NotifyEventChannelFactory") +TAO_Notify_Tests_DECLARE_NAME_A (naming_service, "NameService") -TAO_Notify_Tests_DECLARE_NAME (application_command,"Application") -TAO_Notify_Tests_DECLARE_NAME (application_command_factory,"Application_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (application_command, ACE_TEXT("Application")) +TAO_Notify_Tests_DECLARE_NAME (application_command_factory, ACE_TEXT("Application_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (event_channel_command,"EventChannel") -TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (event_channel_command, ACE_TEXT("EventChannel")) +TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory, ACE_TEXT("EventChannel_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin") -TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command, ACE_TEXT("ConsumerAdmin")) +TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory, ACE_TEXT("ConsumerAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command,"SupplierAdmin") -TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command, ACE_TEXT("SupplierAdmin")) +TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory, ACE_TEXT("SupplierAdmin_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier") -TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, ACE_TEXT("PeriodicSupplier")) +TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, ACE_TEXT("PeriodicSupplier_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer") -TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, ACE_TEXT("PeriodicConsumer")) +TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, ACE_TEXT("PeriodicConsumer_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (poa_command, "POA") -TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, "POA_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (poa_command, ACE_TEXT("POA")) +TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, ACE_TEXT("POA_Command_Factory")) -TAO_Notify_Tests_DECLARE_NAME (filter_command, "Filter") -TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory") +TAO_Notify_Tests_DECLARE_NAME (filter_command, ACE_TEXT("Filter")) +TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, ACE_TEXT("Filter_Command_Factory")) diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h index 602f3d1e6de..188eb6113c0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.h +++ b/TAO/orbsvcs/tests/Notify/lib/Name.h @@ -32,31 +32,31 @@ public: static const char* const event_channel_factory; static const char* const naming_service; - static const char* const command_builder; + static const ACE_TCHAR* const command_builder; - static const char* const application_command_factory; - static const char* const application_command; + static const ACE_TCHAR* const application_command_factory; + static const ACE_TCHAR* const application_command; - static const char* const event_channel_command_factory; - static const char* const event_channel_command; + static const ACE_TCHAR* const event_channel_command_factory; + static const ACE_TCHAR* const event_channel_command; - static const char* const supplier_admin_command_factory; - static const char* const supplier_admin_command; + static const ACE_TCHAR* const supplier_admin_command_factory; + static const ACE_TCHAR* const supplier_admin_command; - static const char* const consumer_admin_command_factory; - static const char* const consumer_admin_command; + static const ACE_TCHAR* const consumer_admin_command_factory; + static const ACE_TCHAR* const consumer_admin_command; - static const char* const periodic_supplier_command; - static const char* const periodic_supplier_command_factory; + static const ACE_TCHAR* const periodic_supplier_command; + static const ACE_TCHAR* const periodic_supplier_command_factory; - static const char* const periodic_consumer_command; - static const char* const periodic_consumer_command_factory; + static const ACE_TCHAR* const periodic_consumer_command; + static const ACE_TCHAR* const periodic_consumer_command_factory; - static const char* const poa_command; - static const char* const poa_command_factory; + static const ACE_TCHAR* const poa_command; + static const ACE_TCHAR* const poa_command_factory; - static const char* const filter_command; - static const char* const filter_command_factory; + static const ACE_TCHAR* const filter_command; + static const ACE_TCHAR* const filter_command_factory; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index 387487eef41..a59676d8871 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -257,7 +257,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification } void -TAO_Notify_Tests_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Consumer::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index 21527b93ac4..6fb76b3e928 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -49,7 +49,7 @@ public: virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter); /// dump stats - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index 6bf3b75202b..d0e866144c5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -23,13 +23,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Consumer_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Consumer_Command::name (void) { return TAO_Notify_Tests_Name::periodic_consumer_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index 1ceb20ea3e7..f61cdcaf201 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -47,8 +47,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: ///= Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 8ed7b16978b..901964d7b1d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -341,7 +341,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void) } void -TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples) +TAO_Notify_Tests_Periodic_Supplier::dump_stats (const ACE_TCHAR* msg, int dump_samples) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 1731e3cb3f7..e6f13144512 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -58,7 +58,7 @@ public: virtual int svc (void); /// Dump stats. - void dump_stats (ACE_TCHAR* msg, int dump_samples); + void dump_stats (const ACE_TCHAR* msg, int dump_samples); /// Get the name of the proxy const char* proxy_name (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 4ce750ceda9..10ada8a1929 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -22,13 +22,13 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_ { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void) { return TAO_Notify_Tests_Periodic_Supplier_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_Periodic_Supplier_Command::name (void) { return TAO_Notify_Tests_Name::periodic_supplier_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 78daa11edce..c30ba056992 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -47,8 +47,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index b11ee0e31d2..d9b9d96f665 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -17,13 +17,13 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command { } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::get_name (void) { return TAO_Notify_Tests_SupplierAdmin_Command::name (); } -const char* +const ACE_TCHAR* TAO_Notify_Tests_SupplierAdmin_Command::name (void) { return TAO_Notify_Tests_Name::supplier_admin_command; diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index 57872a67baf..ed73819a9b0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -45,8 +45,8 @@ public: virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const ACE_TCHAR* get_name (void); + static const ACE_TCHAR* name (void); protected: diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index a2e6db40f33..7d2ae5888cd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -55,8 +55,18 @@ Task_Stats::end_time (ACE_UINT64 time) end_time_ = time; } +void Task_Stats::dump_samples (const char *file_name, const char *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + +void Task_Stats::dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples) +{ + dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples); +} + void -Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) +Task_Stats::dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples) { FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w")); diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h index cc4d7190887..6de23f231f4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h @@ -70,9 +70,13 @@ class TAO_NOTIFY_TEST_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, int dump_samples); + void dump_samples (const char *file_name, const char *msg, int dump_samples); + + void dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples); + + private: + void dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples); - protected: /// Base and end times ACE_UINT64 base_time_; ACE_UINT64 end_time_; diff --git a/ace/ARGV.h b/ace/ARGV.h index feba0fe6b1d..9cb3ff73474 100644 --- a/ace/ARGV.h +++ b/ace/ARGV.h @@ -24,20 +24,21 @@ #include "ace/Unbounded_Queue.h" /** - * @class ACE_ARGV + * @class ACE_TARGV * * @brief Builds a counted argument vector (ala argc/argv) from either * a string or a set of separate tokens. Can substitute environment * variable values for tokens that are environment variable references. */ -class ACE_Export ACE_ARGV +template < typename CHAR_TYPE = char > +class ACE_TARGV { public: // = Initialization and termination. /** * Splits the specified string into an argument vector, split at whitespace. * - * @param buf An ACE_TCHAR array to split into tokens for the vector. + * @param buf An CHAR_TYPE array to split into tokens for the vector. * * @param substitute_env_args If non-zero, any token that is an * an environment variable reference ($VAR) will have @@ -48,57 +49,57 @@ public: * references within a token. For example, @c $HOME/file will * not substitute the value of the HOME environment variable. */ - ACE_ARGV (const ACE_TCHAR buf[], + ACE_TARGV (const CHAR_TYPE buf[], int substitute_env_args = 1); /** * Converts @a argv into a linear string. If @a substitute_env_args * is enabled then we'll substitute the environment variables for * each $ENV encountered in the string. The <buf> operation is not - * allowed on an ACE_ARGV created this way. + * allowed on an ACE_TARGV created this way. */ - ACE_ARGV (ACE_TCHAR *argv[], + ACE_TARGV (CHAR_TYPE *argv[], int substitute_env_args = 1); /** - * Creates an ACE_ARGV which is the concatenation of the first_argv + * Creates an ACE_TARGV which is the concatenation of the first_argv * and the second argv. The argv arguments should be null pointer * terminated. */ - ACE_ARGV (ACE_TCHAR *first_argv[], - ACE_TCHAR *second_argv[], + ACE_TARGV (CHAR_TYPE *first_argv[], + CHAR_TYPE *second_argv[], int substitute_env_args =1); /** - * Entry point for creating an ACE_TCHAR *[] command line + * Entry point for creating an CHAR_TYPE *[] command line * iteratively via the <add> method. When this constructor is used, * the <ITERATIVE> state is enabled. The <argv> and <buf> methods * are allowed, and the result is recreated when called multiple * times. The subscript operator is not allowed. */ - ACE_ARGV (int substitute_env_args = 1); + ACE_TARGV (int substitute_env_args = 1); /// Destructor. - ~ACE_ARGV (void); + ~ACE_TARGV (void); // = Accessor arguments. /// Returns the <index>th string in the ARGV array. - const ACE_TCHAR *operator[] (size_t index); + const CHAR_TYPE *operator[] (size_t index); /** * Returns the @c argv array. Caller should not delete this memory - * since the ACE_ARGV destructor will delete it. If the caller + * since the ACE_TARGV destructor will delete it. If the caller * modifies the array in the iterative mode, the changes are not * saved to the queue. */ - ACE_TCHAR **argv (void); + CHAR_TYPE **argv (void); /// Returns @c argc. int argc (void) const; /// Returns the @c buf. Caller should not delete this memory since - /// the ACE_ARGV destructor will delete it. - const ACE_TCHAR *buf (void); + /// the ACE_TARGV destructor will delete it. + const CHAR_TYPE *buf (void); /// Dump the state of an object. void dump (void) const; @@ -111,45 +112,45 @@ public: /// assume ownership of managing its memory, i.e., the caller is /// responsible for memory management. Returns -1 on failure and 0 /// on success. - int add (const ACE_TCHAR *next_arg); + int add (const CHAR_TYPE *next_arg); /** * Add another @a argv array. The @a argv parameter must be NULL * terminated. This only works in the <ITERATIVE> state. Returns * -1 on failure and 0 on success. */ - int add (ACE_TCHAR *argv[]); + int add (CHAR_TYPE *argv[]); - /// What state is this ACE_ARGV in? + /// What state is this ACE_TARGV in? int state (void) const; // These are the states possible via the different constructors. enum States { - /// ACE_ARGV converts buf[] to ACE_TCHAR *argv[] + /// ACE_TARGV converts buf[] to CHAR_TYPE *argv[] TO_STRING = 1, - /// ACE_ARGV converts ACE_TCHAR *argv[] to buf[] + /// ACE_TARGV converts CHAR_TYPE *argv[] to buf[] TO_PTR_ARRAY = 2, - /// Builds buf[] or ACE_TCHAR *argv[] iteratively with <add>. + /// Builds buf[] or CHAR_TYPE *argv[] iteratively with <add>. ITERATIVE = 3 }; private: /// Copy Constructor not implemented - ACE_ARGV (const ACE_ARGV&); + ACE_TARGV (const ACE_TARGV&); /// Assignment '=' operator not implemented - ACE_ARGV operator= (const ACE_ARGV&); + ACE_TARGV operator= (const ACE_TARGV&); /// Creates buf_ from the queue, deletes previous buf_. int create_buf_from_queue (void); - /// Converts buf_ into the ACE_TCHAR *argv[] format. + /// Converts buf_ into the CHAR_TYPE *argv[] format. int string_to_argv (void); /// Returns the string created from argv in buf and /// returns the number of arguments. - int argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf); + int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf); /// Replace args with environment variable values? int substitute_env_args_; @@ -161,10 +162,10 @@ private: int argc_; /// The array of string arguments. - ACE_TCHAR **argv_; + CHAR_TYPE **argv_; /// Buffer containing the <argv> contents. - ACE_TCHAR *buf_; + CHAR_TYPE *buf_; /// Total length of the arguments in the queue, not counting /// separating spaces @@ -172,12 +173,12 @@ private: /// Queue which keeps user supplied arguments. This is only /// active in the "iterative" mode. - ACE_Unbounded_Queue<ACE_TCHAR *> queue_; + ACE_Unbounded_Queue<CHAR_TYPE *> queue_; }; -#if defined (__ACE_INLINE__) +typedef ACE_TARGV<ACE_TCHAR> ACE_ARGV; + #include "ace/ARGV.inl" -#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ace/ARGV.inl b/ace/ARGV.inl index 00c465f6250..168dd3da866 100644 --- a/ace/ARGV.inl +++ b/ace/ARGV.inl @@ -2,41 +2,316 @@ // $Id$ #include "ace/Global_Macros.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" + +template < typename CHAR_TYPE > void +ACE_TARGV<CHAR_TYPE>::dump (void) const +{ +#if defined (ACE_HAS_DUMP) + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::dump"); + + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); + + ACE_TARGV *this_obj = const_cast<ACE_TARGV *> (this); + + for (int i = 0; i < this->argc_; i++) + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT ("\nargv_[%i] = %s"), + i, + this_obj->argv ()[i])); + + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +#endif /* ACE_HAS_DUMP */ +} + +// Creates this->argv_ out of this->buf_. New memory is allocated for +// each element of the array. This is used by the array-to-string +// style constructor and for creating this->argv_ when in iterative +// mode. + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::string_to_argv (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::string_to_argv"); + + return ACE_OS::string_to_argv (this->buf_, + this->argc_, + this->argv_, + this->substitute_env_args_); +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf) +{ + return ACE_OS::argv_to_string (argv, buf); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (const CHAR_TYPE buf[], + int substitute_env_args) + : substitute_env_args_ (substitute_env_args), + state_ (TO_PTR_ARRAY), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE[] to CHAR_TYPE *[]"); + + if (buf == 0 || buf[0] == 0) + return; + + // Make an internal copy of the string. + ACE_NEW (this->buf_, + CHAR_TYPE[ACE_OS::strlen (buf) + 1]); + ACE_OS::strcpy (this->buf_, buf); + + // Create this->argv_. + if (this->string_to_argv () == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("string_to_argv"))); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *argv[], + int substitute_env_args) + : substitute_env_args_ (substitute_env_args), + state_ (TO_STRING), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] to CHAR_TYPE[]"); + + if (argv == 0 || argv[0] == 0) + return; + + this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args); +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *first_argv[], + CHAR_TYPE *second_argv[], + int substitute_env_args) + : substitute_env_args_ (substitute_env_args), + state_ (TO_STRING), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] + CHAR_TYPE *[] to CHAR_TYPE[]"); + + int first_argc; + int second_argc; + + CHAR_TYPE *first_buf; + CHAR_TYPE *second_buf; + + // convert the first argv to a string + first_argc = this->argv_to_string (first_argv, first_buf); + + // convert the second argv to a string + second_argc = this->argv_to_string (second_argv, second_buf); + + // Add the number of arguments in both the argvs. + this->argc_ = first_argc + second_argc; + + size_t buf_len = + ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1; + + // Allocate memory to the lenght of the combined argv string. + ACE_NEW (this->buf_, + CHAR_TYPE[buf_len + 1]); + + // copy the first argv string to the buffer + ACE_OS::strcpy (this->buf_, first_buf); + + // concatenate the second argv string to the buffer + ACE_OS::strcat (this->buf_, second_buf); + + // Delete the first and second buffers + + delete [] first_buf; + + delete [] second_buf; +} + +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::ACE_TARGV (int substitute_env_args) + : substitute_env_args_ (substitute_env_args), + state_ (ITERATIVE), + argc_ (0), + argv_ (0), + buf_ (0), + length_ (0), + queue_ () +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV Iterative"); + + // Nothing to do yet -- the user puts in arguments via add () +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::add (const CHAR_TYPE *next_arg) +{ + // Only allow this to work in the "iterative" verion -- the + // ACE_TARGVs created with the one argument constructor. + if (this->state_ != ITERATIVE) + { + errno = EINVAL; + return -1; + } + + // Put the new argument at the end of the queue. + if (this->queue_.enqueue_tail (const_cast <CHAR_TYPE *> (next_arg)) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_LIB_TEXT ("Can't add more to ARGV queue")), + -1); + + this->length_ += ACE_OS::strlen (next_arg); + + this->argc_++; + + // Wipe argv_ and buf_ away so that they will be recreated if the + // user calls argv () or buf (). + if (this->argv_ != 0) + { + for (int i = 0; this->argv_[i] != 0; i++) + ACE_OS::free ((void *) this->argv_[i]); + + delete [] this->argv_; + this->argv_ = 0; + } + + delete [] this->buf_; + this->buf_ = 0; + + return 0; +} + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::add (CHAR_TYPE *argv[]) +{ + for (int i = 0; argv[i] != 0; i++) + if (this->add (argv[i]) == -1) + return -1; + + return 0; +} + +// Free up argv_ and buf_ +template < typename CHAR_TYPE > +ACE_TARGV<CHAR_TYPE>::~ACE_TARGV (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::~ACE_TARGV"); + + if (this->argv_ != 0) + for (int i = 0; this->argv_[i] != 0; i++) + ACE_OS::free ((void *) this->argv_[i]); + + delete [] this->argv_; + delete [] this->buf_; +} + +// Create buf_ out of the queue_. This is only used in the +// "iterative" mode. + +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::create_buf_from_queue (void) +{ + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::create_buf_from_queue"); + + // If the are no arguments, don't do anything + if (this->argc_ <= 0) + return -1; + + delete [] this->buf_; + + ACE_NEW_RETURN (this->buf_, + CHAR_TYPE[this->length_ + this->argc_], + -1); + + // Get an iterator over the queue + ACE_Unbounded_Queue_Iterator<CHAR_TYPE *> iter (this->queue_); + + CHAR_TYPE **arg; + CHAR_TYPE *ptr = this->buf_; + size_t len; + int more = 0; + + while (!iter.done ()) + { + // Get next argument from the queue. + iter.next (arg); + + more = iter.advance (); + + len = ACE_OS::strlen (*arg); + + // Copy the argument into buf_ + ACE_OS::memcpy ((void *) ptr, + (const void *) (*arg), + len * sizeof (CHAR_TYPE)); + // Move the pointer down. + ptr += len; + + // Put in an argument separating space. + if (more != 0) + *ptr++ = ' '; + } + + // Put in the NUL terminator + *ptr = '\0'; + + return 0; +} // Return the number of args -ACE_INLINE int -ACE_ARGV::argc (void) const +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::argc (void) const { - ACE_TRACE ("ACE_ARGV::argc"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argc"); return this->argc_; } -// Return the state of this ACE_ARGV -ACE_INLINE int -ACE_ARGV::state(void) const +// Return the state of this ACE_TARGV +template < typename CHAR_TYPE > int +ACE_TARGV<CHAR_TYPE>::state(void) const { - ACE_TRACE ("ACE_ARGV::state"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::state"); return this->state_; } // Return the arguments in a space-separated string -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::buf (void) +template < typename CHAR_TYPE > const CHAR_TYPE * +ACE_TARGV<CHAR_TYPE>::buf (void) { - ACE_TRACE ("ACE_ARGV::buf"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::buf"); if (this->buf_ == 0 && this->state_ == ITERATIVE) this->create_buf_from_queue (); - return (const ACE_TCHAR *) this->buf_; + return (const CHAR_TYPE *) this->buf_; } // Return the arguments in an entry-per-argument array -ACE_INLINE ACE_TCHAR ** -ACE_ARGV::argv (void) +template < typename CHAR_TYPE > CHAR_TYPE ** +ACE_TARGV<CHAR_TYPE>::argv (void) { - ACE_TRACE ("ACE_ARGV::argv"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argv"); // Try to create the argv_ if it isn't there if (this->argv_ == 0) @@ -46,22 +321,22 @@ ACE_ARGV::argv (void) // Convert buf_ to argv_ if (this->string_to_argv () == -1) - return (ACE_TCHAR **) 0; + return (CHAR_TYPE **) 0; } - return (ACE_TCHAR **) this->argv_; + return (CHAR_TYPE **) this->argv_; } // Subscript operator. -ACE_INLINE const ACE_TCHAR * -ACE_ARGV::operator[] (size_t i) +template < typename CHAR_TYPE > const CHAR_TYPE * +ACE_TARGV<CHAR_TYPE>::operator[] (size_t i) { - ACE_TRACE ("ACE_ARGV::operator[]"); + ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::operator[]"); // Don't go out of bounds. if (i >= static_cast<size_t> (this->argc_)) return 0; - return (const ACE_TCHAR *) this->argv ()[i]; + return (const CHAR_TYPE *) this->argv ()[i]; } diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 6ae27087211..cf08f81b4a0 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -665,17 +665,21 @@ typedef ptrdiff_t ptr_arith_t; #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%I64d" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) # else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%d" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) # endif /* ACE_WIN64 */ #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ #if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%I64u" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) # else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%u" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) # endif /* ACE_WIN64 */ #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp index f77946589f2..803dd2f4e32 100644 --- a/ace/Dev_Poll_Reactor.cpp +++ b/ace/Dev_Poll_Reactor.cpp @@ -1376,7 +1376,7 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents)); + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents)); // ACE_ASSERT (0); } diff --git a/ace/Get_Opt.inl b/ace/Get_Opt.inl index 5aad390361e..1db0c562aee 100644 --- a/ace/Get_Opt.inl +++ b/ace/Get_Opt.inl @@ -66,13 +66,13 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Arg_Opt (int argc, { switch (optstring[offset++]) { - case ACE_TEXT('+'): + case ACE_LIB_TEXT('+'): this->ordering_ = REQUIRE_ORDER; break; - case ACE_TEXT('-'): + case ACE_LIB_TEXT('-'): this->ordering_ = RETURN_IN_ORDER; break; - case ACE_TEXT(':'): + case ACE_LIB_TEXT(':'): this->has_colon_ = 1; break; default: @@ -127,8 +127,8 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::nextchar_i (void) this->nextchar_ = 0; return eof(); } - else if (*(this->nextchar_ = this->argv_[this->optind]) != ACE_TEXT('-') - || this->nextchar_[1] == ACE_TEXT('\0')) + else if (*(this->nextchar_ = this->argv_[this->optind]) != ACE_LIB_TEXT('-') + || this->nextchar_[1] == ACE_LIB_TEXT('\0')) { // We didn't get an option. @@ -143,8 +143,8 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::nextchar_i (void) return 1; } else if (this->nextchar_[1] != 0 - && *++this->nextchar_ == ACE_TEXT('-') - && this->nextchar_[1] == ACE_TEXT('\0')) + && *++this->nextchar_ == ACE_LIB_TEXT('-') + && this->nextchar_[1] == ACE_LIB_TEXT('\0')) { // Found "--" so we're done... ++this->optind; @@ -153,10 +153,10 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::nextchar_i (void) } // If it's a long option, and we allow long options advance nextchar_. - if (*this->nextchar_ == ACE_TEXT('-') && this->long_opts_.size () != 0) + if (*this->nextchar_ == ACE_LIB_TEXT('-') && this->long_opts_.size () != 0) this->nextchar_++; - return ACE_TEXT('\0'); + return ACE_LIB_TEXT('\0'); } template < typename CHAR_TYPE > @@ -174,7 +174,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) // Advance to the end of the long option name so we can use // it to get the length for a string compare. - while (*s && *s != ACE_TEXT('=')) + while (*s && *s != ACE_LIB_TEXT('=')) s++; size_t len = s - this->nextchar_; @@ -213,7 +213,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) this->argv_[0], this->argv_[this->optind])); this->nextchar_ = 0; this->optind++; - return ACE_TEXT('?'); + return ACE_LIB_TEXT('?'); } if (pfound != 0) @@ -260,7 +260,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) this->argv_[0], pfound->name_)); this->nextchar_ = 0; this->optopt_ = pfound->val_; // Remember matching short equiv - return this->has_colon_ ? ACE_TEXT(':') : ACE_TEXT('?'); + return this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?'); } } this->nextchar_ = 0; @@ -270,7 +270,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) this->optopt_ = pfound->val_; return pfound->val_; } - if (!this->long_only_ || this->argv_[this->optind][1] == ACE_TEXT('-') + if (!this->long_only_ || this->argv_[this->optind][1] == ACE_LIB_TEXT('-') || this->optstring_->find (*this->nextchar_) == String::npos) { // Okay, we couldn't find a long option. If it isn't long_only (which @@ -283,7 +283,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void) this->argv_[0], this->nextchar_)); this->nextchar_ = 0; this->optind++; - return ACE_TEXT('?'); + return ACE_LIB_TEXT('?'); } return this->short_option_i (); } @@ -304,32 +304,32 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::short_option_i (void) const_cast<Char*> (ACE_OS::strchr (this->optstring_->c_str (), opt)); /* Increment `optind' when we start to process its last character. */ - if (*this->nextchar_ == ACE_TEXT('\0')) + if (*this->nextchar_ == ACE_LIB_TEXT('\0')) ++this->optind; - if (oli == 0 || opt == ACE_TEXT(':')) + if (oli == 0 || opt == ACE_LIB_TEXT(':')) { if (this->opterr) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%s: illegal short option -- %c\n"), this->argv_[0], opt)); - return ACE_TEXT('?'); + return ACE_LIB_TEXT('?'); } - if (opt == ACE_TEXT('W') && oli[1] == ACE_TEXT(';')) + if (opt == ACE_LIB_TEXT('W') && oli[1] == ACE_LIB_TEXT(';')) { if (this->nextchar_[0] == 0) this->nextchar_ = this->argv_[this->optind]; return long_option_i (); } this->optopt_ = oli[0]; // Remember the option that matched - if (oli[1] == ACE_TEXT(':')) + if (oli[1] == ACE_LIB_TEXT(':')) { - if (oli[2] == ACE_TEXT(':')) + if (oli[2] == ACE_LIB_TEXT(':')) { // Takes an optional argument, and since short option args must // must follow directly in the same argument, a NULL nextchar_ // means we didn't get one. - if (*this->nextchar_ != ACE_TEXT('\0')) + if (*this->nextchar_ != ACE_LIB_TEXT('\0')) { this->optarg = this->nextchar_; this->optind++; @@ -341,7 +341,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::short_option_i (void) else { // Takes a required argument. - if (*this->nextchar_ != ACE_TEXT('\0')) + if (*this->nextchar_ != ACE_LIB_TEXT('\0')) { // Found argument in same argv-element. this->optarg = this->nextchar_; @@ -355,7 +355,7 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::short_option_i (void) ACE_LIB_TEXT ("%s: short option requires ") ACE_LIB_TEXT ("an argument -- %c\n"), this->argv_[0], opt)); - opt = this->has_colon_ ? ACE_TEXT(':') : ACE_TEXT('?'); + opt = this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?'); } else // Use the next argv-element as the argument. @@ -385,15 +385,15 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::operator () (void) // We check this because we can string short options together if the // preceding one doesn't take an argument. - if (this->nextchar_ == 0 || *this->nextchar_ == ACE_TEXT('\0')) + if (this->nextchar_ == 0 || *this->nextchar_ == ACE_LIB_TEXT('\0')) { int retval = this->nextchar_i (); if (retval != 0) return retval; } - if (((this->argv_[this->optind][0] == ACE_TEXT('-')) - && (this->argv_[this->optind][1] == ACE_TEXT('-'))) || this->long_only_) + if (((this->argv_[this->optind][0] == ACE_LIB_TEXT('-')) + && (this->argv_[this->optind][1] == ACE_LIB_TEXT('-'))) || this->long_only_) return this->long_option_i (); return this->short_option_i (); @@ -439,9 +439,9 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (const Char *name, short_option))) != 0) { // Short option exists, so verify the argument options - if (s[1] == ACE_TEXT(':')) + if (s[1] == ACE_LIB_TEXT(':')) { - if (s[2] == ACE_TEXT(':')) + if (s[2] == ACE_LIB_TEXT(':')) { if (has_arg != ARG_OPTIONAL) { @@ -630,8 +630,8 @@ ACE_Get_Arg_Opt<CHAR_TYPE>::permute (void) // Skip over args untill we find the next option. while (this->optind < this->argc_ - && (this->argv_[this->optind][0] != ACE_TEXT('-') - || this->argv_[this->optind][1] == ACE_TEXT('\0'))) + && (this->argv_[this->optind][0] != ACE_LIB_TEXT('-') + || this->argv_[this->optind][1] == ACE_LIB_TEXT('\0'))) this->optind++; // Got an option, so mark this as the end of the non options. diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index 75b4b39ab4a..83ea5603395 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -70,7 +70,7 @@ private: # define ACE_ITOA(X) #X // Create a string of a server address with a "host:port" format. -# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P +# define ACE_SERVER_ADDRESS(H,P) H ACE_LIB_TEXT(":") P // A couple useful inline functions for checking whether bits are // enabled or disabled. diff --git a/ace/Makefile.am b/ace/Makefile.am index 581d1a47b9f..1a418763551 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -31,7 +31,6 @@ libACE_la_SOURCES = \ ACE.cpp \ ACE_crc32.cpp \ ACE_crc_ccitt.cpp \ - ARGV.cpp \ ATM_Acceptor.cpp \ ATM_Addr.cpp \ ATM_Connector.cpp \ diff --git a/ace/NT_Service.h b/ace/NT_Service.h index 5f7c206e405..e7be7c68047 100644 --- a/ace/NT_Service.h +++ b/ace/NT_Service.h @@ -416,7 +416,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET) \ ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] = \ { \ - ACE_NT_SERVICE_ENTRY(ACE_TEXT (#SVCNAME), SVCNAME), \ + ACE_NT_SERVICE_ENTRY(ACE_LIB_TEXT (#SVCNAME), SVCNAME), \ { 0, 0 } \ }; \ _ace_nt_svc_obj_##SVCNAME = SVCINSTANCE; \ diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index 3a01c8a39e7..92ac34984cc 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -195,7 +195,6 @@ ACE_OS::mkstemp (char *s) #if !defined (ACE_LACKS_MKSTEMP) return ::mkstemp (s); #else - s[0] = 0; return ACE_OS::mkstemp_emulation (ACE_TEXT_TO_TCHAR_INOUT (s) ); #endif /* !ACE_LACKS_MKSTEMP */ } diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl index 55fb8299a03..f199ee118c8 100644 --- a/ace/OS_NS_sys_mman.inl +++ b/ace/OS_NS_sys_mman.inl @@ -307,7 +307,7 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, ACE_UNUSED_ARG (sa); ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_TO_CHAR_IN(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE); # elif defined (ACE_OPENVMS) - ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); + ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_LIB_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE); # else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. return ACE_OS::open (filename, mode, perms, sa); diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp index ebde7e69e4b..2903fe7ba39 100644 --- a/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ace/SSL/SSL_Asynch_Stream.cpp @@ -198,8 +198,8 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( if (this->ssl_ == 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- cannot allocate new SSL structure") + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("- cannot allocate new SSL structure") )); ::SSL_set_verify (this->ssl_, @@ -218,9 +218,9 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) if (this->flags_ & SF_STREAM_OPEN) // open if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but .. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-") - ACE_TEXT("possible access violation ") - ACE_TEXT("if proactor still handles events\n"))); + ACE_LIB_TEXT("ACE_SSL_Asynch_Stream::DTOR-") + ACE_LIB_TEXT("possible access violation ") + ACE_LIB_TEXT("if proactor still handles events\n"))); ::SSL_free (this->ssl_); this->ssl_ = 0; @@ -310,22 +310,22 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, if (this->flags_ & SF_STREAM_OPEN) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- already opened")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- already opened")), -1); if (this->ssl_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- SSL structure is absent")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- SSL structure is absent")), -1); if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid handle")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- invalid handle")), -1); @@ -353,8 +353,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, if (this->bio_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- cannot allocate new BIO structure")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- cannot allocate new BIO structure")), -1); ::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_); @@ -372,8 +372,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), - ACE_TEXT ("- invalid stream type")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), + ACE_LIB_TEXT ("- invalid stream type")), -1); } @@ -549,7 +549,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void) default: this->print_error (status, - ACE_TEXT ("Shutdown error")); + ACE_LIB_TEXT ("Shutdown error")); retval = -1; break; } @@ -590,8 +590,8 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("- invalid stream type")), + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("- invalid stream type")), -1); } @@ -613,7 +613,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) case SSL_ERROR_SYSCALL: default: this->print_error (status, - ACE_TEXT ("Handshake error")); + ACE_LIB_TEXT ("Handshake error")); return -1; } @@ -672,7 +672,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void) this->notify_read (0, EFAULT); this->print_error (status, - ACE_TEXT ("SSL_read error")); + ACE_LIB_TEXT ("SSL_read error")); return -1; } @@ -722,7 +722,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void) this->notify_write(0, EFAULT); this->print_error (status, - ACE_TEXT ("SSL_write error")); + ACE_LIB_TEXT ("SSL_write error")); return -1; } @@ -905,8 +905,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::size() ") )); errval = EINVAL; @@ -928,8 +928,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt read failed") + ACE_LIB_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt read failed") )); errval = EINVAL; // may be leave EINPROGRESS ?? @@ -969,8 +969,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::size() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::size() ") )); errval = EINVAL; @@ -986,8 +986,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("error in ACE_Message_Block::copy() ") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("error in ACE_Message_Block::copy() ") )); errval = EINVAL; @@ -1005,8 +1005,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") + ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt write failed") )); errval = EINVAL; // may be leave EINPROGRESS ?? @@ -1056,8 +1056,8 @@ ACE_SSL_Asynch_Stream::handle_write_stream ( ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), - ACE_TEXT ("attempt write failed") + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), + ACE_LIB_TEXT ("attempt write failed") )); this->bio_out_errno_ = EINVAL; diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index 191af4b4d28..4fe5260aded 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -82,9 +82,9 @@ ACE_SSL_Context::ssl_library_init (void) if (ACE_OS::mutex_init (&(ACE_SSL_Context::lock_[i]), USYNC_THREAD) != 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") - ACE_TEXT ("- %p\n"), - ACE_TEXT ("mutex_init"))); + ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") + ACE_LIB_TEXT ("- %p\n"), + ACE_LIB_TEXT ("mutex_init"))); } # if !defined (WIN32) @@ -436,7 +436,7 @@ ACE_SSL_Context::report_error (unsigned long error_code) (void) ::ERR_error_string (error_code, error_string); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), + ACE_LIB_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), error_code, error_string)); } diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp index 69fff5ebfa4..fa50a8a5a62 100644 --- a/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ace/SSL/SSL_SOCK_Stream.cpp @@ -42,7 +42,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) ACE_ERROR ((LM_ERROR, "(%P|%t) ACE_SSL_SOCK_Stream " "- cannot allocate new SSL structure %p\n", - ACE_TEXT (""))); + ACE_LIB_TEXT (""))); } } diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 51cf255b4c9..45965f85814 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -523,7 +523,7 @@ ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void) { // @todo make this a constant somewhere (or it there already is one // then use it. - return ACE_TEXT("ACE"); + return ACE_LIB_TEXT("ACE"); } #endif /* ACE_SINGLETON_C */ diff --git a/ace/String_Conversion_T.h b/ace/String_Conversion_T.h index e8b32c884bc..41b13626ec2 100644 --- a/ace/String_Conversion_T.h +++ b/ace/String_Conversion_T.h @@ -321,7 +321,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; // These are defined to get older stuff to compile // FUZZ: disable check_for_tchar # define ASYS_TCHAR ACE_TCHAR -# define ASYS_TEXT ACE_TEXT +# define ASYS_TEXT ACE_LIB_TEXT # define ACE_TEXT_STRING ACE_TString #endif /* ACE_LEGACY_MODE */ diff --git a/ace/ace.mpc b/ace/ace.mpc index a28db2192bb..0f5930d7149 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -24,7 +24,6 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache Active_Map_Manager.cpp Addr.cpp Arg_Shifter.cpp - ARGV.cpp Argv_Type_Converter.cpp Asynch_IO.cpp Asynch_IO_Impl.cpp diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc index 7a949d25515..580aab1a4d9 100644 --- a/ace/ace_for_tao.mpc +++ b/ace/ace_for_tao.mpc @@ -13,7 +13,6 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { Active_Map_Manager.cpp Addr.cpp Arg_Shifter.cpp - ARGV.cpp Argv_Type_Converter.cpp Atomic_Op.cpp Auto_Event.cpp diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 24d7745d228..224cd7cd533 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -379,8 +379,10 @@ // default 32-bit platform-specific format specifiers appropriately. # define ACE_UINT64_FORMAT_SPECIFIER_A "%lu" # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h index cb60ac49b95..e308cc09f05 100644 --- a/ace/config-macosx-panther.h +++ b/ace/config-macosx-panther.h @@ -16,7 +16,8 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ace/config-macosx-tiger.h b/ace/config-macosx-tiger.h index 390d964df9f..9484e261304 100644 --- a/ace/config-macosx-tiger.h +++ b/ace/config-macosx-tiger.h @@ -17,7 +17,8 @@ #undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) // Proper size of long double on both G4/G5 is 16 #define ACE_SIZEOF_LONG_DOUBLE 16 diff --git a/ace/config-macosx.h b/ace/config-macosx.h index 983eccebb1b..ec570d4001d 100644 --- a/ace/config-macosx.h +++ b/ace/config-macosx.h @@ -16,7 +16,8 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h index 8d7965c9c66..821ab46c4c1 100644 --- a/ace/config-netbsd.h +++ b/ace/config-netbsd.h @@ -133,8 +133,10 @@ typedef unsigned long ACE_UINT64; typedef signed long ACE_INT64; -#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld" +#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) +#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #elif defined(__i386__) #define ACE_HAS_PENTIUM 1 diff --git a/ace/config-win32-dmc.h b/ace/config-win32-dmc.h index e7c4544ab63..3b330431fed 100644 --- a/ace/config-win32-dmc.h +++ b/ace/config-win32-dmc.h @@ -23,7 +23,6 @@ # undef ACE_LACKS_STRUCT_DIR #endif -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line # define ACE_CC_NAME ACE_LIB_TEXT ("Digital Mars") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) @@ -68,7 +67,6 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRBUF_T #define ACE_HAS_3_PARAM_WCSTOK diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h index 6d8f315f8d0..8d43e1ab9fd 100644 --- a/ace/config-win32-ghs.h +++ b/ace/config-win32-ghs.h @@ -28,7 +28,6 @@ # define ACE_CONFIG_INCLUDE_GHS_COMMON # include "ace/config-ghs-common.h" -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line # define ACE_CC_NAME ACE_LIB_TEXT ("Green Hills C++") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) @@ -77,7 +76,6 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines # define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u" # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp index 8cdf6217799..49f413065b1 100644 --- a/apps/FaCE/FaCE.cpp +++ b/apps/FaCE/FaCE.cpp @@ -18,7 +18,7 @@ #include <sipapi.h> -ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt"); +ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); /** * This simple and small class manages user-input command line @@ -112,12 +112,12 @@ void ParameterList::addParameter(ACE_TCHAR* newParameter) void ParameterList::saveParameter(FILE* outputFile) { if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+")); + outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+")); } if (outputFile != 0) { if (this->param_ != 0) { - fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_); + fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_); this->next_->saveParameter(outputFile); } else { @@ -173,7 +173,7 @@ void InitSetup() void LoadParameterHistory() { - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r")); + FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r")); if (parameterFile != NULL) { while (feof(parameterFile) == 0) { @@ -328,12 +328,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_SETTING_RUN: { #ifdef NO_ACE - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; CE_ARGV ce_argv(g_CommandLine); main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #else - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; ACE_CE_ARGV ce_argv(g_CommandLine); ACE::init(); ACE_MAIN_OBJECT_MANAGER @@ -341,7 +341,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag ace_main_i(ce_argv.argc(), ce_argv.argv()); ACE::fini(); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #endif // NO_ACE } break; @@ -388,7 +388,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) GetClientRect(hWnd, &textRect); nCmdHt = CommandBar_Height(mbi.hwndMB); - hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"), + hWndEdit = CreateWindow(ACE_TEXT("EDIT"), NULL, WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, 0, @@ -457,7 +457,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { SHINITDLGINFO shidi; - ACE_TCHAR* copyrightNote = ACE_LIB_TEXT( + ACE_TCHAR* copyrightNote = ACE_TEXT( "ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \ Computing at Washington University,© 1993-2002, all rights reserved. \ FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\ @@ -552,7 +552,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); EndDialog(hDlg, wmId); - tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r")); + tempFile = _wfopen(tempBuffer, ACE_TEXT("r")); if (tempFile != NULL) // if file exists { diff --git a/apps/FaCE/FaCE.h b/apps/FaCE/FaCE.h index 8a4b80425d9..ef1842323c0 100644 --- a/apps/FaCE/FaCE.h +++ b/apps/FaCE/FaCE.h @@ -30,7 +30,7 @@ #include "CE_Screen_Output.h" #define ACE_TCHAR wchar_t -#define ACE_LIB_TEXT(STRING) L##STRING +#define ACE_TEXT(STRING) L##STRING #define ACE_CE_Screen_Output CE_Screen_Output int main_i(int, wchar_t**); diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp index c2e74f38548..0c62f0fe78c 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -279,7 +279,7 @@ ACE_Blob_Writer::send_request (void) // Create the header, store the actual length in mesglen. // NOTE! %lu is really what's wanted. ACE_SIZE_T_FORMAT_SPECIFIER is - // defined in terms of ACE_LIB_TEXT which is NOT what we want here. + // defined in terms of ACE_TEXT which is NOT what we want here. mesglen = ACE_OS::sprintf (mesg, "%s /%s %s %lu\n\n", request_prefix_, filename_, request_suffix_, (unsigned long)length_); diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp index 2a7a4d30808..f9bfbf6a147 100644 --- a/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -181,9 +181,9 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // This is a major hack to get the size_t format spec to be a narrow // char, same as the other strings for printf() here. It only works // because this is the end of the source file. It makes the - // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_LIB_TEXT, effectively. -#undef ACE_LIB_TEXT -#define ACE_LIB_TEXT(A) A + // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_TEXT, effectively. +#undef ACE_TEXT +#define ACE_TEXT(A) A if (this->verbose ()) ACE_OS::printf ("%8d = initial concurrency hint\n" ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n" diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp index 31ec41fa55f..46ddad01923 100644 --- a/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -176,13 +176,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) break; } - // HACK! This needs to be done to avoid the mismatch from ACE_LIB_TEXT + // HACK! This needs to be done to avoid the mismatch from ACE_TEXT // in ACE_SIZE_T_FORMAT_SPECIFIER to narrow-char on wide-char builds. // It only works because it's at the end of the file. -# if defined (ACE_LIB_TEXT) -# undef ACE_LIB_TEXT +# if defined (ACE_TEXT) +# undef ACE_TEXT # endif -# define ACE_LIB_TEXT(X) X +# define ACE_TEXT(X) X if (this->verbose ()) ACE_OS::printf ("%8d = initial concurrency hint\n" ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n" diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 4cf08965fcb..110091b67af 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -979,7 +979,7 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // we're not equal if we cannot get rhs int rc = false; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue); + ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), intValue); originalString = int_value; } else if (originalType == ACE_Configuration::BINARY) @@ -1001,10 +1001,10 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) while (binary_length) { if (ptr != binary_data) - originalString += ACE_LIB_TEXT (","); + originalString += ACE_TEXT (","); ACE_OS::sprintf (bin_value, - ACE_LIB_TEXT ("%02x"), + ACE_TEXT ("%02x"), *ptr); originalString += bin_value; --binary_length; diff --git a/tests/HTBP/Reactor_Tests/test_config.h b/tests/HTBP/Reactor_Tests/test_config.h index 3697dd9d294..a675e9a6f3c 100644 --- a/tests/HTBP/Reactor_Tests/test_config.h +++ b/tests/HTBP/Reactor_Tests/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index 771fe9fed40..44bc283d160 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp index 029349a1a43..e24403b6e9b 100644 --- a/tests/Proactor_Test_IPV6.cpp +++ b/tests/Proactor_Test_IPV6.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp index a63a0e6e848..89841f0b6d5 100644 --- a/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/tests/Refcounted_Auto_Ptr_Test.cpp @@ -37,7 +37,7 @@ Printer::Printer (const char *message) : message_ (message) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Creating Printer object\n"))); + ACE_TEXT ("(%t) Creating Printer object\n"))); ++Printer::instance_count_; } @@ -45,14 +45,14 @@ Printer::~Printer (void) { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Deleting Printer object\n"))); + ACE_TEXT ("(%t) Deleting Printer object\n"))); } void Printer::print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) %s\n"), + ACE_TEXT ("(%t) %s\n"), ACE_TEXT_TO_TCHAR_IN(this->message_))); } @@ -129,18 +129,18 @@ Method_Request_print::Method_Request_print (Scheduler *new_scheduler, printer_ (printer) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print created\n"))); + ACE_TEXT ("(%t) Method_Request_print created\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } Method_Request_print::~Method_Request_print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print will be deleted.\n"))); + ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } @@ -199,7 +199,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) : activation_queue_ (msg_queue ()), scheduler_ (new_scheduler) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler created\n"))); + ACE_TEXT ("(%t) Scheduler created\n"))); } // Destructor @@ -207,7 +207,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) Scheduler::~Scheduler (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler will be destroyed\n"))); + ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); } // open @@ -216,7 +216,7 @@ int Scheduler::open (void *) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler open\n"))); + ACE_TEXT ("(%t) Scheduler open\n"))); // Become an Active Object. int num_threads = 3; return this->activate (THR_BOUND | THR_JOINABLE, num_threads); @@ -227,7 +227,7 @@ Scheduler::open (void *) int Scheduler::close (u_long) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) rundown\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) rundown\n"))); return 0; } @@ -244,13 +244,13 @@ Scheduler::svc (void) if (0 == mo_p) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) activation queue shut down\n"))); + ACE_TEXT ("(%t) activation queue shut down\n"))); break; } auto_ptr<ACE_Method_Request> mo (mo_p); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) calling method request\n"))); + ACE_TEXT ("(%t) calling method request\n"))); // Call it. if(mo->call () == -1) break; @@ -312,7 +312,7 @@ template class ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex>; int run_main (int, ACE_TCHAR *[]) { - ACE_START_TEST (ACE_LIB_TEXT ("Refcounted_Auto_Ptr_Test")); + ACE_START_TEST (ACE_TEXT ("Refcounted_Auto_Ptr_Test")); // ========================================================================= @@ -320,7 +320,7 @@ run_main (int, ACE_TCHAR *[]) // thread of control, hence we use the ACE_Null_Mutex ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing synchronous test...\n"))); + ACE_TEXT ("(%t) performing synchronous test...\n"))); Printer *printer1; ACE_NEW_RETURN (printer1, @@ -336,7 +336,7 @@ run_main (int, ACE_TCHAR *[]) ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex> r6 = r1; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); @@ -347,7 +347,7 @@ run_main (int, ACE_TCHAR *[]) // threads of control. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing asynchronous test...\n"))); + ACE_TEXT ("(%t) performing asynchronous test...\n"))); Scheduler *scheduler_ptr; @@ -379,7 +379,7 @@ run_main (int, ACE_TCHAR *[]) scheduler->wait (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp index fe98527be0f..4c9e36e70dc 100644 --- a/tests/Svc_Handler_Test.cpp +++ b/tests/Svc_Handler_Test.cpp @@ -40,23 +40,23 @@ run_test (SVC_HANDLER &svc_handler, { ACE_Message_Block *mb; ACE_NEW (mb, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("hello ")))); + ACE_Message_Block (sizeof (ACE_TEXT("hello ")))); ACE_Message_Block *cb1; ACE_NEW (cb1, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); ACE_Message_Block *cb2; ACE_NEW (cb2, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); mb->copy ("hello ", - ACE_OS::strlen (ACE_LIB_TEXT("hello "))); + ACE_OS::strlen (ACE_TEXT("hello "))); cb1->copy ("there ", - ACE_OS::strlen (ACE_LIB_TEXT("there "))); + ACE_OS::strlen (ACE_TEXT("there "))); mb->cont (cb1); cb2->copy ("doug\n", - ACE_OS::strlen (ACE_LIB_TEXT("doug\n"))); + ACE_OS::strlen (ACE_TEXT("doug\n"))); cb1->cont (cb2); // Note that this is a buffered call! @@ -132,15 +132,15 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_FILE_Info info; file_io.get_info (info); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("file size = %d\n"), info.size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("file size = %d\n"), info.size_)); for (ssize_t n_bytes; (n_bytes = file_io.recv (buf, ACE_MAXLOGMSGLEN)) > 0; ) { buf[n_bytes] = '\0'; - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s"), ACE_TEXT_TO_TCHAR_IN(buf))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s"), ACE_TEXT_TO_TCHAR_IN(buf))); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); file_io.close (); |