diff options
290 files changed, 749 insertions, 456 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e1960c5a6fa..9bd62c7fe4b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,296 @@ +Tue Sep 16 12:03:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp + * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp + * orbsvcs/examples/CosEC/Simple/Consumer.cpp + * orbsvcs/examples/CosEC/Simple/Consumer.h + * orbsvcs/examples/CosEC/Simple/Service.cpp + * orbsvcs/examples/CosEC/Simple/Supplier.cpp + * orbsvcs/examples/CosEC/Simple/Supplier.h + * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp + * orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp + * orbsvcs/examples/ImR/Advanced/manager_main.cpp + * orbsvcs/examples/ImR/Advanced/TestClient.cpp + * orbsvcs/examples/ImR/Advanced/TestServer.cpp + * orbsvcs/examples/LoadBalancing/client.cpp + * orbsvcs/examples/LoadBalancing/server.cpp + * orbsvcs/examples/Log/Event/Event_Consumer.cpp + * orbsvcs/examples/Log/Event/Event_Consumer.h + * orbsvcs/examples/Log/Event/Event_Supplier.cpp + * orbsvcs/examples/Log/Event/Event_Supplier.h + * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp + * orbsvcs/examples/Log/Notify/Notify_Consumer.h + * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp + * orbsvcs/examples/Log/Notify/Notify_Supplier.h + * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp + * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h + * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp + * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h + * orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp + * orbsvcs/examples/Notify/Lanes/Consumer_Client.h + * orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp + * orbsvcs/examples/Notify/Lanes/Supplier_Client.h + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp + * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h + * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp + * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h + * orbsvcs/examples/ORT/client.cpp + * orbsvcs/examples/ORT/gateway_server.cpp + * orbsvcs/examples/ORT/server.cpp + * orbsvcs/examples/PSS/Simple_Naming.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Consumer.h + * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp + * orbsvcs/examples/RtEC/IIOPGateway/EC.h + * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Gateway.h + * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Supplier.h + * orbsvcs/examples/RtEC/Kokyu/Service.cpp + * orbsvcs/examples/RtEC/MCast/MCast.cpp + * orbsvcs/examples/RtEC/Schedule/Service.cpp + * orbsvcs/examples/RtEC/Simple/Consumer.cpp + * orbsvcs/examples/RtEC/Simple/Consumer.h + * orbsvcs/examples/RtEC/Simple/Service.cpp + * orbsvcs/examples/RtEC/Simple/Supplier.cpp + * orbsvcs/examples/RtEC/Simple/Supplier.h + * orbsvcs/examples/Security/SecurityLevel1/client.cpp + * orbsvcs/examples/Security/Send_File/client.cpp + * orbsvcs/examples/Security/Send_File/server.cpp + * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp + * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp + * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h + * orbsvcs/Naming_Service/NT_Naming_Server.cpp + * orbsvcs/Notify_Service/NT_Notify_Server.cpp + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp + * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h + * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h + * orbsvcs/orbsvcs/IFRService/Options.cpp + * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp + * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp + * orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp + * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp + * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp + * orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp + * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp + * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp + * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp + * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp + * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp + * orbsvcs/tests/AVStreams/Full_Profile/server.cpp + * orbsvcs/tests/AVStreams/Latency/control.cpp + * orbsvcs/tests/AVStreams/Latency/ping.cpp + * orbsvcs/tests/AVStreams/Latency/pong.cpp + * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp + * orbsvcs/tests/AVStreams/Multicast/ftp.cpp + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp + * orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp + * orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp + * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp + * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp + * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp + * orbsvcs/tests/Bug_1395_Regression/client.cpp + * orbsvcs/tests/Bug_1395_Regression/server.cpp + * orbsvcs/tests/Bug_2137_Regression/client.cpp + * orbsvcs/tests/Bug_2247_Regression/Manager.cpp + * orbsvcs/tests/Bug_2247_Regression/server.cpp + * orbsvcs/tests/Bug_2248_Regression/client.cpp + * orbsvcs/tests/Bug_2248_Regression/server.cpp + * orbsvcs/tests/Bug_2285_Regression/client.cpp + * orbsvcs/tests/Bug_2285_Regression/client2.cpp + * orbsvcs/tests/Bug_2285_Regression/server.cpp + * orbsvcs/tests/Bug_2285_Regression/server2.cpp + * orbsvcs/tests/Bug_2287_Regression/client.cpp + * orbsvcs/tests/Bug_2287_Regression/server.cpp + * orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp + * orbsvcs/tests/Bug_2615_Regression/client.cpp + * orbsvcs/tests/Bug_2615_Regression/server.cpp + * orbsvcs/tests/Bug_2709_Regression/client.cpp + * orbsvcs/tests/Bug_2709_Regression/server.cpp + * orbsvcs/tests/Bug_2800_Regression/client.cpp + * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp + * orbsvcs/tests/Bug_2800_Regression/server.cpp + * orbsvcs/tests/Bug_2925_Regression/client.cpp + * orbsvcs/tests/Bug_2925_Regression/server.cpp + * orbsvcs/tests/Bug_3215_Regression/client.cpp + * orbsvcs/tests/Bug_3215_Regression/server.cpp + * orbsvcs/tests/Bug_3216_Regression/client.cpp + * orbsvcs/tests/Bug_3216_Regression/server.cpp + * orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp + * orbsvcs/tests/Concurrency/CC_client.cpp + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h + * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp + * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp + * orbsvcs/tests/EC_Mcast/EC_Mcast.h + * orbsvcs/tests/EC_MT_Mcast/MCast.cpp + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp + * orbsvcs/tests/EC_Multiple/EC_Multiple.h + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp + * orbsvcs/tests/EC_Throughput/ECT_Throughput.h + * orbsvcs/tests/Event/Basic/BCast.cpp + * orbsvcs/tests/Event/Basic/BCast.h + * orbsvcs/tests/Event/Basic/Observer.cpp + * orbsvcs/tests/Event/Basic/Observer.h + * orbsvcs/tests/Event/Basic/Reconnect.cpp + * orbsvcs/tests/Event/Basic/Reconnect.h + * orbsvcs/tests/Event/Basic/Schedule.cpp + * orbsvcs/tests/Event/Basic/Schedule.h + * orbsvcs/tests/Event/lib/Driver.cpp + * orbsvcs/tests/Event/lib/Driver.h + * orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp + * orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h + * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp + * orbsvcs/tests/Event/Performance/Connect.cpp + * orbsvcs/tests/Event/Performance/Connect.h + * orbsvcs/tests/Event/Performance/Latency.cpp + * orbsvcs/tests/Event/Performance/Latency_Server.cpp + * orbsvcs/tests/Event/Performance/Throughput.cpp + * orbsvcs/tests/Event/Performance/Throughput.h + * orbsvcs/tests/Event/UDP/receiver.cpp + * orbsvcs/tests/Event/UDP/sender.cpp + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp + * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp + * orbsvcs/tests/FaultTolerance/IOGR/server.cpp + * orbsvcs/tests/FT_App/FT_Client.cpp + * orbsvcs/tests/FT_App/FT_Creator.cpp + * orbsvcs/tests/FT_App/FT_Creator.h + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp + * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp + * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp + * orbsvcs/tests/FT_App/FT_TestReplica_i.h + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp + * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp + * orbsvcs/tests/FT_App/StubFaultConsumer.cpp + * orbsvcs/tests/FT_App/StubFaultNotifier.cpp + * orbsvcs/tests/HTIOP/AMI/client.cpp + * orbsvcs/tests/HTIOP/AMI/server.cpp + * orbsvcs/tests/HTIOP/AMI/simple_client.cpp + * orbsvcs/tests/HTIOP/BiDirectional/client.cpp + * orbsvcs/tests/HTIOP/BiDirectional/server.cpp + * orbsvcs/tests/HTIOP/Hello/client.cpp + * orbsvcs/tests/HTIOP/Hello/server.cpp + * orbsvcs/tests/ImplRepo/airplane_client_i.cpp + * orbsvcs/tests/ImplRepo/airplane_server_i.cpp + * orbsvcs/tests/ImplRepo/nestea_client_i.cpp + * orbsvcs/tests/ImplRepo/nestea_server_i.cpp + * orbsvcs/tests/ImplRepo/scale/server_i.cpp + * orbsvcs/tests/ImplRepo/scale/server_i.h + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp + * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp + * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp + * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp + * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp + * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp + * orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp + * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp + * orbsvcs/tests/IOR_MCast/server_i.cpp + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp + * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp + * orbsvcs/tests/Miop/McastHello/client.cpp + * orbsvcs/tests/Miop/McastHello/server.cpp + * orbsvcs/tests/Notify/Basic/AdminProperties.h + * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp + * orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp + * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp + * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp + * orbsvcs/tests/Notify/lib/Driver.cpp + * orbsvcs/tests/Notify/lib/Driver.h + * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp + * orbsvcs/tests/Notify/MC/Structured_Supplier.cpp + * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp + * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp + * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp + * orbsvcs/tests/Notify/performance- * orbsvcs/tests/Filter/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/performance- * orbsvcs/tests/Filter/Sequence_Supplier.cpp + * orbsvcs/tests/Notify/performance- * orbsvcs/tests/Filter/Structured_Consumer.cpp + * orbsvcs/tests/Notify/performance- * orbsvcs/tests/Filter/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp + * orbsvcs/tests/Notify/Reconnecting/Consumer.h + * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp + * orbsvcs/tests/Notify/Reconnecting/Supplier.h + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp + * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp + * orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp + * orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp + * orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp + * orbsvcs/tests/RTCosScheduling/client.cpp + * orbsvcs/tests/RTCosScheduling/server.cpp + * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp + * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp + * orbsvcs/tests/Security/BiDirectional/client.cpp + * orbsvcs/tests/Security/BiDirectional/server.cpp + * orbsvcs/tests/Security/Big_Request/client.cpp + * orbsvcs/tests/Security/Big_Request/server.cpp + * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp + * orbsvcs/tests/Security/Bug_1107_Regression/server.cpp + * orbsvcs/tests/Security/Crash_Test/client.cpp + * orbsvcs/tests/Security/Crash_Test/server.cpp + * orbsvcs/tests/Security/EndpointPolicy/test.cpp + * orbsvcs/tests/Security/InsecureReferences/test.cpp + * orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp + * orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp + * orbsvcs/tests/Security/MT_SSLIOP/client.cpp + * orbsvcs/tests/Security/MT_SSLIOP/server.cpp + * orbsvcs/tests/Security/Secure_Invocation/client.cpp + * orbsvcs/tests/Security/Secure_Invocation/server.cpp + * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp + * orbsvcs/tests/Simple_Naming/client.cpp + * orbsvcs/tests/Time/Client_i.cpp + * orbsvcs/tests/Trading/colocated_test.cpp + ACE_TCHAR changes + Tue Sep 16 11:59:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * Release: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 304d6b27dd9..f822eadaa6d 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -13,7 +13,7 @@ namespace { ACE_CString id, kind, output; } -int parse_args(int argc, char* argv[]) +int parse_args(int argc, ACE_TCHAR* argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:k:o:")); int opt; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 19d3dd06682..ab7d5c60913 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -95,7 +95,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void) //public int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("n:o:f:")); int c; while ( (c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 1ca418ff98c..823d5b1fefb 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -127,7 +127,7 @@ int TAO::FT_FaultDetectorFactory_i::write_ior() int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "d:l:o:qr"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:l:o:qr")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index d113228eb47..07861f0d4fa 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -147,7 +147,7 @@ int TAO::FT_FaultNotifier_i::write_ior() int TAO::FT_FaultNotifier_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:rq"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:rq")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index d6cfc7207a3..d23c6c14637 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -280,7 +280,7 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "activate" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h")); this->server_name_ = argv[1]; int c; @@ -313,7 +313,7 @@ int TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv) { // Skip the "autostart" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h")); int c; @@ -359,7 +359,7 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "ior" command - ACE_Get_Opt get_opts (argc, argv, "hf:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hf:")); this->server_name_ = argv[1]; if (this->server_name_.length() == 0 || this->server_name_[0] == '-') @@ -416,7 +416,7 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "list" command - ACE_Get_Opt get_opts (argc, argv, "vh", server_flag); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("vh"), server_flag); int c; @@ -461,7 +461,7 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "remove" command - ACE_Get_Opt get_opts (argc, argv, "h"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h")); this->server_name_ = 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_Opt get_opts (argc, argv, "h"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h")); this->server_name_ = argv[1]; int c; @@ -552,7 +552,7 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "shutdown-repo" command - ACE_Get_Opt get_opts (argc, argv, "ha"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ha")); int c; @@ -622,7 +622,7 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv) } // Skip both the program name and the "update" command - ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:r:R:l:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hc:w:a:e:r:R:l:")); this->server_name_ = argv[1]; int c; diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 9b60326ad05..a7234350433 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -43,7 +43,7 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv []) } int -Basic_Logging_Service::parse_args (int argc, char *argv[]) +Basic_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 65f2158aa62..08dd63f399d 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -44,7 +44,7 @@ Event_Logging_Service::init_ORB (int& argc, char *argv []) } int -Event_Logging_Service::parse_args (int argc, char *argv[]) +Event_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index bef1b328826..36b34b6e7b6 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -59,7 +59,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []) } int -Notify_Logging_Service::parse_args (int argc, char *argv[]) +Notify_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h index 64247a620fa..31f96fdcdc0 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h @@ -60,7 +60,7 @@ protected: int init_ORB (int& argc, char *argv []); // initialize the ORB. - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); // Parses the command line arguments. void resolve_naming_service (void); diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index ee5f8886224..dbbafbeabb7 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -43,7 +43,7 @@ RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]) int -RTEvent_Logging_Service::parse_args (int argc, char *argv[]) +RTEvent_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x")); int opt; @@ -91,7 +91,7 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv[]) } int -RTEvent_Logging_Service::init (int argc, char* argv[]) +RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[]) { // initialize the ORB. this->init_ORB (argc, argv); diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h index 31db988dc4f..cc1201ed2e2 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h @@ -38,7 +38,7 @@ public: virtual ~RTEvent_Logging_Service (void); // Destructor. - int init (int argc, char* argv[]); + int init (int argc, ACE_TCHAR* argv[]); // Initializes the Telecom Log Service. int run (void); @@ -53,7 +53,7 @@ protected: void init_ORB (int& argc, char *argv []); // initializes the ORB. - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void resolve_naming_service (void); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 3675d0fdaf5..66130cfca55 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -112,9 +112,9 @@ Options::print_usage_and_die (void) } void -Options::parse_args (int argc, char *argv[]) +Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:rskt:d"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:rskt:d")); int c; while ((c = get_opt ()) != -1) @@ -172,7 +172,7 @@ ACE_NT_SERVICE_DEFINE (service, "TAO NT Naming Service"); int -Options::run (int argc, char* argv[]) +Options::run (int argc, ACE_TCHAR* argv[]) { SERVICE::instance ()->name ("TAO_NT_Naming_Service", "TAO NT Naming Service"); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 48ae3e772fe..9bccf77c4e9 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -60,7 +60,7 @@ public: int run (int argc, char *argv[]); private: - void parse_args (int argc, char *argv[]); + void parse_args (int argc, ACE_TCHAR *argv[]); void print_usage_and_die (void); private: @@ -115,9 +115,9 @@ Options::print_usage_and_die (void) } void -Options::parse_args (int argc, char *argv[]) +Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:rskt:d"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:rskt:d")); int c; while ((c = get_opt ()) != -1) @@ -175,7 +175,7 @@ ACE_NT_SERVICE_DEFINE (service, "TAO NT Notify Service"); int -Options::run (int argc, char* argv[]) +Options::run (int argc, ACE_TCHAR* argv[]) { SERVICE::instance ()->name ("TAO_NT_Notify_Service", "TAO NT Notify Service"); diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index a37f5796fc7..87cbb5e6694 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -21,7 +21,7 @@ FactoryDriver::~FactoryDriver (void) int FactoryDriver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opts (argc, argv, "dr:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dr:")); int c = 0; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp index 276e6d8b327..a8cf069628f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp @@ -37,7 +37,7 @@ RtEC_Based_CosEC::init_ORB (int& argc, char *argv []) int RtEC_Based_CosEC::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "t:n:e:o:p:r"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:n:e:o:p:r")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 009b5b33292..1320ceaa02a 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -13,7 +13,7 @@ Consumer::Consumer () int Consumer::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:c:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp index c192fe0ab28..f796a5ae336 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -13,7 +13,7 @@ Supplier::Supplier () int Supplier::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:c:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 3ec1581f3de..ea5fe183bb4 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -23,7 +23,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index ee022ef3e3b..cd03b0c7b32 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h @@ -35,7 +35,7 @@ public: Consumer (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The CosEventComm::PushConsumer methods diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index d15a2af735a..97ac478cf77 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -11,7 +11,7 @@ ACE_RCSID (CosEC_Simple, const char *ior_output_file = "ec.ior"; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -87,9 +87,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index c39ad862e31..dc181fe157a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -23,7 +23,7 @@ Supplier::Supplier (void) } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 789c67bda1f..9f26df820ed 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h @@ -35,7 +35,7 @@ public: Supplier (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The CosEventComm::PushSupplier methods diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 0d3404d8125..ba2ea3bcfa5 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -19,9 +19,9 @@ typedef ACE_Unbounded_Queue<ACE_SString> IOR_QUEUE; IOR_QUEUE ior_strs; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index 33418c5a18b..5884640a350 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -13,9 +13,9 @@ const char *ior_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:c:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:c:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 3a7f0b11629..ca22b01f7f6 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -31,7 +31,7 @@ TestClient::~TestClient() int TestClient::parseCommands (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:t:i:r:x:e:z:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s:t:i:r:x:e:z:")); int c; while ((c = get_opts()) != -1) { @@ -126,7 +126,7 @@ void TestClient::run() { ACE_ERROR((LM_ERROR, "%p\n", "activate failed")); } - + this->wait(); ACE_DEBUG((LM_DEBUG, "* Client ended.\n")); diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp index fb90751fada..d8225ac077b 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp @@ -50,7 +50,7 @@ string normalizePath(const string& dir, char delim, bool toLower) char buffer[PATH_MAX + 2]; string::size_type i = 0; - + for (; ACE_OS::ace_isspace (dir[i]); i++) { // No action. @@ -197,7 +197,7 @@ TestServer::~TestServer() // int TestServer::parseCommands (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp index 30ee7d36e35..b4913540690 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp @@ -11,7 +11,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) long retryCount = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_Get_Opt get_opts (argc, argv, "r:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("r:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp index c5270d9eb7d..f5cdd2cda07 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp @@ -14,9 +14,9 @@ int niterations = 100; int number; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index ef2f235e565..7c4e3c03fde 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -19,9 +19,9 @@ const char * strategy = "LeastLoaded"; int number; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:s:r:c:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:s:r:c:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index a400a12eb3b..336f21db41b 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -25,7 +25,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 641291357d9..3b49c025a83 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -37,7 +37,7 @@ public: Consumer (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The CosEventComm::PushConsumer methods diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 7c55821a082..f41ca5befd4 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -28,7 +28,7 @@ Supplier::Supplier (void) } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index a9370f40a2c..c69524c9a54 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -37,7 +37,7 @@ public: Supplier (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The CosEventComm::PushSupplier methods diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 3ab7a703ce3..16872092e01 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -33,7 +33,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index f67f8d7c830..608c87a4823 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -40,7 +40,7 @@ public: Consumer (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test protected: diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index f367b06466b..9cc2bd0d94c 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -37,7 +37,7 @@ Supplier::~Supplier () } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index 22d20672f07..fe0069fe0fe 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -44,7 +44,7 @@ public: ~Supplier (); // Destructor. - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test private: diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index ece0cbdf9f1..b17859f534c 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -26,7 +26,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index b84035dfc9d..f99208db8b8 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -38,7 +38,7 @@ public: Consumer (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The RtecEventComm::PushConsumer methods diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 07fd17cddfd..e4b3cbda2e9 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -31,7 +31,7 @@ Supplier::Supplier (void) } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index cc3fc9bad0d..9e456ff78ee 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -38,7 +38,7 @@ public: Supplier (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The RtecEventComm::PushSupplier methods diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 83f0c7ce8dc..bd8bb1c2c74 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -24,7 +24,7 @@ TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client () } int -TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[]) +TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h index 48f27dffcf4..e5c5e259f94 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h @@ -45,7 +45,7 @@ public: void run (void); /// Parse Args - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. virtual int svc (void); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index c540938cac3..85b51bb21a5 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -25,7 +25,7 @@ TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client () } int -TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) +TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h index 241bb1b28e8..2f63fe0bba6 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h @@ -42,7 +42,7 @@ public: void run (void); /// Parse Args - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. virtual int svc (void); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index b5a41fe1203..2a23ddca625 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -26,7 +26,7 @@ TAO_Notify_ThreadPool_Consumer_Client::~TAO_Notify_ThreadPool_Consumer_Client () } int -TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) +TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index dc89f60312f..d7fead0d8a2 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -45,7 +45,7 @@ public: void run (void); /// Parse Args - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. virtual int svc (void); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 6d57b4f85f5..087f830a6a8 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -28,7 +28,7 @@ TAO_Notify_ThreadPool_Supplier_Client::~TAO_Notify_ThreadPool_Supplier_Client () } int -TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) +TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h index 67595ae49ee..36d85c7c896 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h @@ -41,7 +41,7 @@ public: void run (void); /// Parse Args - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. virtual int svc (void); diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp index 10b51b80cf2..a5b81b395cc 100644 --- a/TAO/orbsvcs/examples/ORT/client.cpp +++ b/TAO/orbsvcs/examples/ORT/client.cpp @@ -10,9 +10,9 @@ ACE_RCSID (ORT, const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp index c66b934870c..52cee3ca99d 100644 --- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp +++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp @@ -9,9 +9,9 @@ const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp index 81562f810eb..5f0d1f7b4b9 100644 --- a/TAO/orbsvcs/examples/ORT/server.cpp +++ b/TAO/orbsvcs/examples/ORT/server.cpp @@ -10,9 +10,9 @@ const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp index 576e7b28517..6f4ce232b5b 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp @@ -26,9 +26,9 @@ ACE_RCSID (PSS, client, "$Id$") const char *ior_output_file = "simple_naming.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 972181383dc..b95b56daade 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -33,7 +33,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { @@ -157,7 +157,7 @@ Consumer::disconnect_push_consumer (void) } int -Consumer::parse_args (int argc, char *argv[]) +Consumer::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h index a477656b498..dca617c9a01 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h @@ -32,7 +32,7 @@ public: Consumer (void); /// Run the test - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // = The RtecEventComm::PushConsumer methods @@ -41,7 +41,7 @@ public: virtual void disconnect_push_consumer (void); private: - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// Keep track of the number of events received. CORBA::ULong event_count_; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index 6f3009c2350..b27bb6d05f9 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -30,7 +30,7 @@ EC::EC (void) } int -EC::run (int argc, char* argv[]) +EC::run (int argc, ACE_TCHAR* argv[]) { TAO_EC_Default_Factory::init_svcs (); @@ -118,7 +118,7 @@ EC::run (int argc, char* argv[]) } int -EC::parse_args (int argc, char *argv[]) +EC::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h index 2734de1dcd0..3a5e78c832f 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h @@ -30,10 +30,10 @@ public: EC (void); /// Run the test - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); private: - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); }; #endif /* EC_H */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index abda8735f78..e33e9db4378 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -31,7 +31,7 @@ Gateway::Gateway (void) } int -Gateway::run (int argc, char* argv[]) +Gateway::run (int argc, ACE_TCHAR* argv[]) { TAO_EC_Gateway_IIOP_Factory::init_svcs (); @@ -134,7 +134,7 @@ Gateway::run (int argc, char* argv[]) } int -Gateway::parse_args (int argc, char *argv[]) +Gateway::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h index 6c7d931d988..cf105a5d5e1 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h @@ -29,10 +29,10 @@ public: Gateway (void); /// Run the test - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); private: - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); }; #endif /* GATEWAY_H */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 9e2cf6558cd..e08b1657a5a 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -33,7 +33,7 @@ Supplier::Supplier (void) } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { @@ -148,7 +148,7 @@ Supplier::disconnect_push_supplier (void) } int -Supplier::parse_args (int argc, char *argv[]) +Supplier::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h index 4e4a3c97fe7..52b937ae896 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h @@ -31,7 +31,7 @@ public: Supplier (void); /// Run the test - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // = The RtecEventComm::PushSupplier methods @@ -39,7 +39,7 @@ public: virtual void disconnect_push_supplier (void); private: - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); }; #endif /* SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 71e3e950311..032bec532a2 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -35,7 +35,7 @@ inline RtecScheduler::Period_t time_val_to_period (const ACE_Time_Value &tv) return static_cast<RtecScheduler::Period_t> (tv.sec () * 1000000 + tv.usec ())*10; } -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); typedef TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_RMS_SCHED_TYPE; @@ -439,9 +439,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "cs:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("cs:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index af1e33adb86..051b784ae3d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -22,7 +22,7 @@ ACE_RCSID (EC_Examples, const char *udp_mcast_address = ACE_DEFAULT_MULTICAST_ADDR ":10001"; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -315,9 +315,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("m:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 961d7db4a12..9fcba83a6b5 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -20,7 +20,7 @@ ACE_RCSID(EC_Examples, Service, "$Id$") int config_run = 0; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; @@ -341,9 +341,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "c"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("c")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index 1e554a81916..c38b2f7a2bf 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -25,7 +25,7 @@ Consumer::Consumer (void) } int -Consumer::run (int argc, char* argv[]) +Consumer::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h index 8641e434194..3bff4a75d1d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h @@ -36,7 +36,7 @@ public: Consumer (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The RtecEventComm::PushConsumer methods diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 7ca71673ba7..df74243932d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -12,7 +12,7 @@ ACE_RCSID (EC_Examples, const char *ior_output_file = "ec.ior"; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -101,9 +101,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 4e26cbf4ba7..a15f5690fe3 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -25,7 +25,7 @@ Supplier::Supplier (void) } int -Supplier::run (int argc, char* argv[]) +Supplier::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h index 2587333a271..f66ac71fc29 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h @@ -36,7 +36,7 @@ public: Supplier (void); // Constructor - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test // = The RtecEventComm::PushSupplier methods diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 5495a61ac75..fc0b064543c 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -7,9 +7,9 @@ ACE_RCSID (SecurityLevel1, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 210b9c047bd..8b7063d4614 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -9,9 +9,9 @@ ACE_RCSID(Send_File, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 22b1255a621..a84129b710b 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -10,9 +10,9 @@ ACE_RCSID(Send_File, server, "$Id$") const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index c744ce00030..8f7857a0d29 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -34,7 +34,7 @@ TAO_EC_Simple_Queue_Full_Action::init_svcs (void) } int -TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[]) +TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) { // Here we look at the args and set an internal flag indicating whether // the default action should be to wait for the queue to not be full diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 327141626bb..e5473cf7957 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -64,7 +64,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual int queue_full_action (TAO_EC_Dispatching_Task *task, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 2b62599ff60..99e20dccd4d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -52,7 +52,7 @@ TAO_EC_Gateway_IIOP_Factory::fini (void) } int -TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[]) +TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) { int result = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h index 75f924e36f8..08db60aeb05 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h @@ -48,7 +48,7 @@ public: /// The Service_Object entry points. //@{ - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); //@} diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 0c3401f769f..36aec7f29d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -23,7 +23,7 @@ TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void) int -TAO_EC_RTCORBA_Factory::init (int argc, char* argv[]) +TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[]) { return this->body_->init (argc, argv); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index a76bc59f73d..c85724ed43b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -46,7 +46,7 @@ public: virtual ~TAO_EC_RTCORBA_Factory (void); // Decorated methods... - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); virtual int fini (void); virtual TAO_EC_Dispatching* create_dispatching (TAO_EC_Event_Channel_Base*); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 4125e94efc7..a5d3be5fd91 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -36,7 +36,7 @@ TAO_EC_TPC_Factory::init_svcs (void) } int -TAO_EC_TPC_Factory::init (int argc, char* argv[]) +TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); @@ -86,7 +86,7 @@ TAO_EC_TPC_Factory::create_dispatching (TAO_EC_Event_Channel_Base *) TAO_EC_Queue_Full_Service_Object* so = this->find_service_object (this->queue_full_service_object_name_.fast_rep(), TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME); - + return new TAO_EC_TPC_Dispatching (this->dispatching_threads_, this->dispatching_threads_flags_, this->dispatching_threads_priority_, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h index 333290f7357..90705d169c0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h @@ -43,7 +43,7 @@ public: static int init_svcs (void); // = The Service_Object entry points - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); // = The EC_Factory methods virtual TAO_EC_Dispatching* diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index d0da3371543..d00960cb07c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -27,7 +27,7 @@ Options::~Options () int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:pb:lm:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:pb:lm:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index d938aa82e6c..d69e3ef2033 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -66,7 +66,7 @@ TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void) int TAO::PG_FactoryRegistry::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:q"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:q")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h index 8b7ab75adf2..b914111489e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h @@ -38,7 +38,7 @@ public: // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString &prefix); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index ee574e58a5e..cc38df00648 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -117,7 +117,7 @@ TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg, char **path) int -TAO::SSLIOP::Protocol_Factory::init (int argc, char* argv[]) +TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { char *certificate_path = 0; char *private_key_path = 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 169e12b7bf2..ab70ee6e193 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -64,7 +64,7 @@ namespace TAO // = Service Configurator hooks. /// Dynamic linking hook - virtual int init (int argc, char* argv[]); + virtual int init (int argc, ACE_TCHAR* argv[]); /// Verify prefix is a match virtual int match_prefix (const ACE_CString & prefix); @@ -91,11 +91,11 @@ namespace TAO /// if the prefix can not be recognized. The *path will point /// to the part of the original buffer, after the initial ':', /// or will contain 0, if no path was specified. - /// + /// /// Beware: This function modifies the buffer pointed to by arg! - /// + /// static int parse_x509_file (char *arg, char **path); - + /// Create and register the SSLIOP ORB initializer. int register_orb_initializer ( CSIIOP::AssociationOptions csiv2_target_supports, diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index a0152f77345..561e074b369 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -21,9 +21,9 @@ int do_shutdown = 1; float rate = 0; int number; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:n:r:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index e25b190f4d8..38bcd476878 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -20,9 +20,9 @@ const char * strategy = "Random"; int num_threads = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:s:r:c:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 073f2aaf557..fb5b31c6c99 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -22,9 +22,9 @@ int do_shutdown = 1; float rate = 0; int number; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hxk:i:n:r:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index b6fc63306d1..a8d3906feaa 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -24,9 +24,9 @@ CORBA::Float dampening = 0; const char * strategy = "Random"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:s:r:c:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 4fe176cf052..b01e0a770c4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -65,7 +65,7 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:l:h:w:v:zr")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index 3cc046d687c..6bd62249ff8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -28,7 +28,7 @@ int use_rt_corba = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:i:p:n:rd")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp index 389aa84e774..69ea18b3656 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -25,7 +25,7 @@ int nthreads = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp index ada87d85c2f..8ca08730ef7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -28,7 +28,7 @@ int nthreads = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index 88c7bc85a35..1c7b871c3fb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -30,7 +30,7 @@ int nthreads = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp index f4e050458cb..62e6a35181b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -281,7 +281,7 @@ Measuring_Task::svc () int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "H:L:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("H:L:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp index 98209718d75..d2ec3272b97 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp @@ -165,7 +165,7 @@ Task::svc() int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "h:l:n:r"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h:l:n:r")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index da20a3ab815..1645ec153ab 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -115,7 +115,7 @@ int Distributer::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:a:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("s:r:a:")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index b4a7120b182..deb069975d5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -56,7 +56,7 @@ int Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:da:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("s:f:r:da:")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index ac6ba3ec903..73ffd0a6666 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -160,7 +160,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index e206c4a0eec..fb7a616a9a8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -125,7 +125,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index dea39eaf911..45c189bb5c1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -270,7 +270,7 @@ Distributer::parse_args (int argc, ACE_TCHAR *argv[]) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:r:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("s:r:")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index 6fcabc36c41..7dd71e181a7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -172,7 +172,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { /// Parse command line arguments - ACE_Get_Opt opts (argc, argv, "s:f:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("s:f:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 77bda68da78..5a19a60e97a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -103,7 +103,7 @@ int Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "f:l:a:p:s"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:l:a:p:s")); this->use_sfp_ = 0; int c; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index df6ea1f50af..9715951a2f5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -167,7 +167,7 @@ Server::run (void) int Server::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "f:p:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:")); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 9ba44bdef16..1f66f83bfb8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -23,7 +23,7 @@ int milliseconds = 30000; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:g:s:r:t:p:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index d13bfea5204..56431c44497 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -28,7 +28,7 @@ ACE_Throughput_Stats recv_latency; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("xo:s:r:t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 459e42b5cf5..8b37ee17cb2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -33,7 +33,7 @@ ACE_Throughput_Stats send_latency; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("xo:s:r:t:b:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 5bade3033e9..c966ea1e17a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -91,7 +91,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 16f1666ceb8..c6e1fa212b0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -124,7 +124,7 @@ int Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "f:a:p:s"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:a:p:s")); this->use_sfp_ = 0; int c; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index e2dc82edd0c..3ba8d35eda8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -101,7 +101,7 @@ FTP_Client_Producer::get_callback (const char *, int Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "f:a:p:sd"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:a:p:sd")); this->use_sfp_ = 0; int c; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index a5a3cd54ab0..97c49ba3a29 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -187,7 +187,7 @@ Server::run (void) int Server::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "f:p:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:")); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index e851ea6b48e..9a38db856b4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -143,7 +143,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 28e72ac9eb3..11656628774 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -70,7 +70,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 3899d04da8b..33452156a47 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -62,7 +62,7 @@ Client::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:l:a:p:r:sd"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:l:a:p:r:sd")); this->use_sfp_ = 0; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index be006606cd8..f34c0c19d96 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -58,7 +58,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index df11b286ec6..77a873d08cb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -85,7 +85,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:r:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:r:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index 0f949e89a12..039a8c5052d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -66,7 +66,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:dl:a:s:b:")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 9b50924ed13..4814b315cd7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -85,7 +85,7 @@ Sender::parse_args (int argc, ACE_TCHAR *argv[]) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:p:r:l:a:d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("f:p:r:l:a:d")); int c; while ((c= opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp index bf8b16d90b4..d0ca1ed2875 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp @@ -7,9 +7,9 @@ const char *ior = "file://test.ior"; int shutdown_server = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 4b8a5e07d42..e06c0d69223 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -7,9 +7,9 @@ const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 7fd8f5d6cf5..cfcd3ec5afc 100644 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp @@ -10,9 +10,9 @@ CORBA::ORB_var orb = CORBA::ORB::_nil (); int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 3f9ccea5b92..d56dc2c59bd 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -33,7 +33,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:c:sm"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:k:b:l:c:sm")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index c0ea1458d12..47815c75c68 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -7,9 +7,9 @@ const char *ior_output_file = 0; const char *key = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 2ee4ea5a357..102d1d8df28 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -29,7 +29,7 @@ CORBA::Object_var object_secondary = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:g:h:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:k:b:l:g:h:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index d7aff08ac0a..b611efc8d98 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -13,9 +13,9 @@ const char* merged_iorstr = 0; const char *key = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:k:f:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp index b6994793464..2572bfe95ba 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp index f63e3e806da..c109a8c330a 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp @@ -15,9 +15,9 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; CORBA::ULong number_of_servers = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp index 1d672291ead..798d1b3f5ae 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp @@ -19,9 +19,9 @@ const char *ior_output_file = "test.ior"; TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index 7d7adbabe6a..3e2c71ece62 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -18,9 +18,9 @@ const char *ior_output_file = ""; CORBA::ULong my_id_number = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:")); int c; ACE_CString ior_file ("n"); while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp index d05652ff6bd..fec46ac33c9 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp index 9397a959907..2f9c86097e6 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp @@ -19,9 +19,9 @@ const char *ior_output_file = "test.ior"; TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp index 0e0e684ac75..91ab1821f5e 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp @@ -26,9 +26,9 @@ test_sleep (int microsec) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "u:c:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("u:c:")); const unsigned char full_success = 0x03; unsigned char success = 0; diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp index c65013b9b88..5ecf4c2036b 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp @@ -13,9 +13,9 @@ const char *ior = "file://ior.ior"; const char *iogr = "file://iogr.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:l:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp index 29356e4fba3..2bb0ae6fb33 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp @@ -20,9 +20,9 @@ const char *iogr_output_file = "iogr.ior"; TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:p:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp index bb4d611dfaf..7077cd95300 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp @@ -19,9 +19,9 @@ ACE_CString server_ior_file("server.ior"); ////////////////////////////////////////////////////////////////////////// int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s:o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp index 127b9760716..772e847ab7a 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp @@ -16,9 +16,9 @@ ACE_RCSID (Hello, const char *ior_output_file = "server.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp index 66f6a8bf893..44a2e93d1a5 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp @@ -10,9 +10,9 @@ const char *ior = "file://shutdown.ior"; bool shutdown_nsmain = false; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp index c3d0cdefaea..0231c8a7738 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp @@ -43,7 +43,7 @@ void TestTask::end() int TestTask::parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "s"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp index 6895bc74235..7bccae0bebc 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp @@ -37,7 +37,7 @@ void TestTask::end() int TestTask::parse_args (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "o:s"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:s")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp index 735b8035292..3cead715763 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp @@ -75,9 +75,9 @@ test_sleep (int microsec) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); const unsigned char full_success = 0x01; unsigned char success = 0; diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp index ae88aaff670..e80706a061a 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp @@ -13,9 +13,9 @@ const char *uipmc_url = 0; const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "u:o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("u:o:")); const unsigned char full_success = 0x03; unsigned char success = 0; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp index c961b222a81..f9c2023ee61 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp @@ -10,9 +10,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp index f91cb60d2f5..bdf93447e4e 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp @@ -19,9 +19,9 @@ const char *ior_output_file = "test.ior"; TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp index f5e01d813c1..7b11367992b 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp @@ -10,9 +10,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp index 6078f04f8d5..44101d0d8eb 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp @@ -19,9 +19,9 @@ const char *ior_output_file = "test.ior"; TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp index 89d052de82e..c0236657c25 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp @@ -13,9 +13,9 @@ ACE_CString client_orb; CORBA::Boolean result = false; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "sk:o:n"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("sk:o:n")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index b13c756d058..00a71a488ed 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -90,7 +90,7 @@ CC_Client::read_ior (char *filename) int CC_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dc:sf:k:xbhe:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dc:sf:k:xbhe:")); int c; int result; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index bdcc001e096..a029c1108cf 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -44,7 +44,7 @@ Driver::Driver (void) // **************************************************************** int -Driver::run (int argc, char* argv[]) +Driver::run (int argc, ACE_TCHAR* argv[]) { try { @@ -290,7 +290,7 @@ Driver::disconnect_consumers (void) int Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "dc:n:h:p:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dc:n:h:p:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index c354a41c798..3389fd1c50c 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -72,7 +72,7 @@ public: // Maximum number of consumers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. void push_consumer (void* consumer_cookie, @@ -82,7 +82,7 @@ public: // received events it will invoke this method. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 21b7db81e83..6acf341c23b 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -32,7 +32,7 @@ ECMS_Driver::ECMS_Driver (void) // **************************************************************** int -ECMS_Driver::run (int argc, char* argv[]) +ECMS_Driver::run (int argc, ACE_TCHAR* argv[]) { try { @@ -309,7 +309,7 @@ ECMS_Driver::disconnect_suppliers (void) int ECMS_Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "ds:n:t:h:p:b:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("ds:n:t:h:p:b:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 718846597cb..9390c8ea998 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -88,7 +88,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. int supplier_task (Test_Supplier *supplier, @@ -104,7 +104,7 @@ public: // testing the short-circuit case. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec); diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 7b7079fe1c9..0563a021801 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -59,7 +59,7 @@ run_orb_within_thread (void *) return 0; } -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -353,9 +353,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("m:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 7a14b21efb8..6e1274fc473 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -38,7 +38,7 @@ ECM_Driver::ECM_Driver (void) } int -ECM_Driver::run (int argc, char* argv[]) +ECM_Driver::run (int argc, ACE_TCHAR* argv[]) { try { @@ -311,7 +311,7 @@ ECM_Driver::dump_results (void) int ECM_Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "l:p:c:n:t:f:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("l:p:c:n:t:f:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 96f43929d34..41f7f5591d5 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -401,7 +401,7 @@ public: // Maximum number of federations in the simulation }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Run the test, read all the configuration files, etc. void federation_has_shutdown (ECM_Local_Federation *federation); @@ -436,7 +436,7 @@ private: int shutdown (void); // Called when the main thread. - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line arguments int parse_config_file (void); diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 3a1f53fa95f..400566bcaf4 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -129,7 +129,7 @@ print_priority_info (const char *const name) } int -Test_ECG::run (int argc, char* argv[]) +Test_ECG::run (int argc, ACE_TCHAR* argv[]) { try { @@ -1027,7 +1027,7 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const int Test_ECG::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "l:r:s:i:xh:w:p:d:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("l:r:s:i:xh:w:p:d:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 7a1cce73f24..b676704001a 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -172,7 +172,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. void push_supplier (void* supplier_cookie, @@ -220,7 +220,7 @@ private: // Called when the main thread (i.e. not the scavenger thread) is // shutting down. - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void dump_results (void); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 2131d1302a2..dbdec2b186d 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -46,7 +46,7 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void) } int -ECT_Consumer_Driver::run (int argc, char* argv[]) +ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) { try { @@ -271,7 +271,7 @@ ECT_Consumer_Driver::disconnect_consumers (void) int ECT_Consumer_Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:o:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("xdc:s:h:p:o:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 5075bf4d3d4..c0b61601fdb 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -41,7 +41,7 @@ public: // Maximum number of consumers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. virtual void shutdown_consumer (void* consumer_cookie); @@ -50,7 +50,7 @@ public: // suppliers. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 9d837308fc8..409e42594db 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -51,7 +51,7 @@ ECT_Supplier_Driver::shutdown_consumer (void*) } int -ECT_Supplier_Driver::run (int argc, char* argv[]) +ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) { try { @@ -277,7 +277,7 @@ ECT_Supplier_Driver::dump_results (void) int ECT_Supplier_Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "ds:u:n:t:b:h:p:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("ds:u:n:t:b:h:p:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index 27f364428cb..7e49cc71264 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -42,11 +42,11 @@ public: // Maximum number of suppliers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index e5a069b9558..1685828df29 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -61,7 +61,7 @@ ECT_Throughput::~ECT_Throughput (void) } int -ECT_Throughput::run (int argc, char* argv[]) +ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) { try { @@ -439,7 +439,7 @@ ECT_Throughput::dump_results (void) int ECT_Throughput::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dc:s:u:n:t:b:h:l:p:w:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index cf7a13ac3ad..6b7f41449dd 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -40,7 +40,7 @@ public: // Maximum number of suppliers. }; - int run (int argc, char* argv[]); + int run (int argc, ACE_TCHAR* argv[]); // Execute the test. virtual void shutdown_consumer (void* consumer_cookie); @@ -49,7 +49,7 @@ public: // suppliers. private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index f10370b8689..ebcc534da39 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -28,7 +28,7 @@ EC_BCast::EC_BCast (void) } int -EC_BCast::parse_args (int& argc, char* argv[]) +EC_BCast::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 7505a06a1b7..a635546da68 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -33,7 +33,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable bcastions - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 7265e2d0851..336f6e1c798 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -40,7 +40,7 @@ EC_Master::~EC_Master (void) } int -EC_Master::run (int argc, char* argv[]) +EC_Master::run (int argc, ACE_TCHAR* argv[]) { try { @@ -238,7 +238,7 @@ EC_Observer::initialize_orb_and_poa (int&, char*[]) } int -EC_Observer::parse_args (int& argc, char* argv[]) +EC_Observer::parse_args (int& argc, ACE_TCHAR* argv[]) { return this->EC_Driver::parse_args (argc, argv); } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index d307ba61e04..cb51f1adb57 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -38,10 +38,10 @@ public: virtual ~EC_Master (void); /// Execute the test. - virtual int run (int argc, char* argv[]); + virtual int run (int argc, ACE_TCHAR* argv[]); /// Obtain the orb and the poa pointers - virtual void initialize_orb_and_poa (int& argc, char* argv[]); + virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); /// Accessors int channel_count (void) const; @@ -86,8 +86,8 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable observerions - virtual void initialize_orb_and_poa (int& argc, char* argv[]); - virtual int parse_args (int& argc, char* argv[]); + virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 0548e3240f6..d07ee37c42f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -28,12 +28,12 @@ EC_Reconnect::EC_Reconnect (void) } int -EC_Reconnect::parse_args (int& argc, char* argv[]) +EC_Reconnect::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Get_Opt get_opt (argc, argv, "scd:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("scd:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index e1524d00b2c..21b190d767e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -43,7 +43,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable reconnections - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index eee815e21ec..ed84937dff7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -28,7 +28,7 @@ EC_Schedule::EC_Schedule (void) } int -EC_Schedule::parse_args (int& argc, char* argv[]) +EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index c627edeb04d..6acfc38ab8e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -47,7 +47,7 @@ public: // = The EC_Driver methods /// add some command line args to change the scheduling service to /// use. - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 4cbc551f59b..39bedd6096c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -28,7 +28,7 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message) int Gateway_EC::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "i:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h index 801040fa6d4..537e23c23e1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h @@ -34,7 +34,7 @@ private: /// Helpers. //@{ - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); int check_for_nil (CORBA::Object_ptr obj, const char *message); void write_ior_file (CORBA::ORB_ptr orb, RtecEventChannelAdmin::EventChannel_ptr ec); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index f4314daf2e1..e46af7aeab8 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -542,7 +542,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) int parse_args (int argc, char ** argv) { - ACE_Get_Opt get_opt (argc, argv, "d"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("d")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index ad1b03d9b6e..ca9611a4411 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -33,7 +33,7 @@ EC_Connect::execute_test (void) } int -EC_Connect::parse_args (int& argc, char* argv[]) +EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h index 03e7896e3da..82bcb0e646d 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -47,7 +47,7 @@ public: // Constructor // = The EC_Driver methods - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_usage (void); virtual void print_args (void) const; diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 8816a5c9ed2..ec10a1477dd 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -20,7 +20,7 @@ int do_dump_history = 0; const char *ec_ior = "file://ec.ior"; /// Parse the arguments. -static int parse_args (int argc, char *argv[]); +static int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -236,9 +236,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("hi:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 05d44c0b8cf..f3d2f08b05c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -17,7 +17,7 @@ ACE_RCSID(EC_Tests_Performance, Latency_Server, "$Id$") const char *ior_file_name = "ec.ior"; /// Parse the arguments. -static int parse_args (int argc, char *argv[]); +static int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -134,9 +134,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 158b76ce34c..c3babe4dd4e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -24,7 +24,7 @@ EC_Throughput::EC_Throughput (void) } int -EC_Throughput::parse_args (int& argc, char* argv[]) +EC_Throughput::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index c460b502266..20b5bc63fcf 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -36,7 +36,7 @@ public: // Constructor // = The EC_Driver methods - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); // add some command line args to enable/disable throughputions diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index ff12b7b91fa..5ecf50fc613 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -22,7 +22,7 @@ const char *udp_mcast_address = ACE_DEFAULT_MULTICAST_ADDR ":10001"; bool valuetype = false; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -300,9 +300,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "vm:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("vm:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index 276c56f8c5a..aa396d73190 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -21,7 +21,7 @@ const char *udp_mcast_address = ACE_DEFAULT_MULTICAST_ADDR ":10001"; bool valuetype = false; -int parse_args (int argc, char *argv[]); +int parse_args (int argc, ACE_TCHAR *argv[]); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) @@ -251,9 +251,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -int parse_args (int argc, char *argv[]) +int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "vm:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("vm:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index a61718061bf..7d3d0e24cb8 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -59,7 +59,7 @@ EC_Driver::~EC_Driver (void) } int -EC_Driver::run (int argc, char* argv[]) +EC_Driver::run (int argc, ACE_TCHAR* argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index 4350334c119..4dadcfcdee4 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -62,19 +62,19 @@ public: int verbose (void) const; /// Execute the test. - virtual int run (int argc, char* argv[]); + virtual int run (int argc, ACE_TCHAR* argv[]); /// The initialization section - virtual void run_init (int& argc, char* argv[]); + virtual void run_init (int& argc, ACE_TCHAR* argv[]); /// The cleanup section virtual void run_cleanup (void); /// Initialize the ORB and obtain the RootPOA object - virtual void initialize_orb_and_poa (int& argc, char* argv[]); + virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); /// Parse the common command-line arguments for all tests - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); /// Print the usage method virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 9f3e8fbb475..ecbbaa27761 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -21,7 +21,7 @@ public: ///////////////// // initialization - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); //////////// // execution @@ -163,7 +163,7 @@ void FTClientMain::commandUsage(FILE* out) } int -FTClientMain::parse_args (int argc, char *argv[]) +FTClientMain::parse_args (int argc, ACE_TCHAR *argv[]) { this->argc_ = argc; this->argv_ = argv; @@ -171,7 +171,7 @@ FTClientMain::parse_args (int argc, char *argv[]) // note: dfnkx are simple_util options // include them here so we can detect bad args - ACE_Get_Opt get_opts (argc, argv, "c:f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("c:f:")); int c; while (result == 0 && (c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 8aa47e4137a..8645266cdb2 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -39,11 +39,11 @@ FTAPP::FT_Creator::~FT_Creator () } int -FTAPP::FT_Creator::parse_args (int argc, char *argv[]) +FTAPP::FT_Creator::parse_args (int argc, ACE_TCHAR *argv[]) { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "r:ignf:u:p:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("r:ignf:u:p:")); int c; while (result == 0 && (c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h index e7908de8f98..76b04e8bb2d 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h @@ -40,7 +40,7 @@ namespace FTAPP ///////////////// // initialization - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); int init (CORBA::ORB_ptr orb); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 66dcf920711..bb4aedec65c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -160,7 +160,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) int FT_ReplicaFactory_i::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:f:i:l:t:qu"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:f:i:l:t:qu")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index 6965f0d6721..a5dfbaab7bb 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -109,7 +109,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int &argc, ACE_TCHAR *argv[ { int result = 0; - ACE_Get_Opt get_opts (argc, argv, "k:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:x")); int c; while (result == 0 && (c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index 67b6bbe4cf1..9257aa9a454 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -160,7 +160,7 @@ const char * FT_TestReplica_i::repository_id() } int -FT_TestReplica_i::parse_args (int argc, char *argv[]) +FT_TestReplica_i::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h index 7e3e5147af9..bc2c79af911 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h @@ -47,7 +47,7 @@ public: * @param argv classic C argv * @return 0 if ok, otherwise process exit code. */ - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /** * provide information to appear in a "usage" display. diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 07c2920f87d..b6756819aa1 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -38,7 +38,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index cdc0cd8f04d..dbbacfefea1 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -25,7 +25,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer () int StubFaultAnalyzer::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index b5f8aea762b..c46b4459b51 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -40,7 +40,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); #else // NO_ARGS_FOR_NOW - ACE_Get_Opt get_opts (argc, argv, ""); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 6ed5f3e9c0e..944a2f59b68 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -35,7 +35,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const int StubFaultNotifier::parse_args (int argc, char * argv[]) { int optionError = 0; - ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 98156ebffe4..bcef937904a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -14,9 +14,9 @@ const char *ior = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index f263b2011c3..80882cde765 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -21,9 +21,9 @@ ACE_RCSID (ForwardRequest, const char *ior_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index acb4f7972f2..728e8e5c056 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -25,7 +25,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:b:c:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index 6302133a368..d0937d4f443 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -6,9 +6,9 @@ const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 14fc07be35f..f2be81ae8db 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -32,9 +32,9 @@ int debug = 0; int number_of_replies = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:n:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dk:n:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 51820b26174..b5d6edb83c1 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -28,9 +28,9 @@ ACE_RCSID(AMI, server, "$Id$") const char *ior_output_file = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index c6822b2a483..2c7adc4355f 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -34,9 +34,9 @@ int shutdown_flag = 0; int debug = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:i:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dk:i:x")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 31bd14965f6..aaccbd6af13 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -14,9 +14,9 @@ void do_nothing (void) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index b8bb53b3304..1787005bc50 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -12,9 +12,9 @@ const char *ior_output_file = 0; int no_iterations = 10; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index 3ea6e486806..bc207da393b 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -9,9 +9,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 0f2901479e2..c658a10733e 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -13,9 +13,9 @@ ACE_RCSID (Hello, const char *ior_output_file = "test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index 3878ae082c1..311f9c1aa48 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -145,7 +145,7 @@ Server_i::enable_multicast (const char *ior) int Server_i::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("a:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 636ebf28830..09c633e85c4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -22,7 +22,7 @@ Airplane_Client_i::Airplane_Client_i (void) int Airplane_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:k:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index ee335dfe6f2..e71d5cd918b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -29,7 +29,7 @@ Airplane_Server_i::Airplane_Server_i (void) int Airplane_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index 0c0fcf31891..a094a6b70e7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -22,7 +22,7 @@ Nestea_Client_i::Nestea_Client_i (void) int Nestea_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dsn:k:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dsn:k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 8f83c89e0c6..ee270b4ba31 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -36,7 +36,7 @@ Nestea_Server_i::~Nestea_Server_i (void) int Nestea_Server_i::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:"); + ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 55c240db56a..24ad06e5079 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -51,9 +51,9 @@ Server_i::~Server_i() } int -Server_i::parse_args (int argc, char* argv[]) +Server_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:c:h"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:c:h")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h index 24d8dc97c8d..a27ea52189b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h @@ -20,7 +20,7 @@ public: int run (void); private: - int parse_args (int argc, char* argv[]); + int parse_args (int argc, ACE_TCHAR* argv[]); CORBA::ORB_var orb_; PortableServer::POA_var root_poa_; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 88e6efa9b88..6e4f7651fcc 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -90,7 +90,7 @@ int IFR_DII_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dn"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("dn")); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp index 195d37c0ce5..35fc2ea100f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp @@ -13,7 +13,7 @@ namespace int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:s:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:s:")); const unsigned char full_success = 0x03; unsigned char success = 0; @@ -66,7 +66,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return -1; } - // get IFR + // get IFR CORBA::Object_var objref = the_orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ifr_ior_file)); if (objref.in () == 0) @@ -97,7 +97,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); } - // get value type definition + // get value type definition CORBA::ExtValueDef_var value_def = CORBA::ExtValueDef::_narrow (current_contained.in ()); CORBA::ExtValueDef::ExtFullValueDescription * value_descr; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp index f1d92b4048e..b2c3a0093f1 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp @@ -14,7 +14,7 @@ namespace int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:s:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:s:")); const unsigned char full_success = 0x01; unsigned char success = 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index ccb03231393..5e7e3b47923 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -330,7 +330,7 @@ int IDL3_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "d"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("d")); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 8518da5fadb..7c91e0c8232 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -137,7 +137,7 @@ Admin_Client::run (void) int Admin_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "di:t:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("di:t:")); int c; int result = 0; CORBA::ULong i = 0; 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 c57819d94cf..a6262595679 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -150,7 +150,7 @@ int Latency_Query_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dhi:"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("dhi:")); int c; int result = 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index f589868bbcc..afbec9f6bd3 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -88,7 +88,7 @@ int Ptest::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt opts (argc, argv, "dq"); + ACE_Get_Opt opts (argc, argv, ACE_TEXT("dq")); int c; while ((c = opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index b7854e4782f..e694c3ccdf4 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -44,7 +44,7 @@ int NContextExt_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dvs"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs")); int c; this->view_ = 1; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 6ef42ee3e6c..0add44c2838 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -8,9 +8,9 @@ ACE_RCSID (Application_Controlled, const char *ior = "file://obj.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index 3fc36df9dd7..58a0a3cf2b1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -10,9 +10,9 @@ ACE_RCSID (Infrastructure_Controlled, const char *ior = "file://obj.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index c3e0f5ed71f..cf2e2f03211 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -15,9 +15,9 @@ const int MAX_RETRIES = 10; const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::LoadAverage; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "l:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("l:")); int c; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 2420a638b20..c30a2860334 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -509,9 +509,9 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite) int -BasicLog_Test::parse_args (int argc, char *argv[]) +BasicLog_Test::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "di"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("di")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index ddcf34c7a19..57fe7068e12 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -12,9 +12,9 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://test.ior"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index 8fba7d0928d..0900000c8a5 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -19,9 +19,9 @@ static const char *ior_output_file = "test.ior"; static const char *group_ior = "corbaloc:miop:1.0@1.0-TestDomain-1/224.1.239.2:1234"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 5ce59f56701..9a74a888f9c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -92,7 +92,7 @@ public: AdminProperties (void); ~AdminProperties (void); - int parse_args (int argc, char *argv[]) ; + int parse_args (int argc, ACE_TCHAR *argv[]) ; // Initialization. diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index c44cf9bbbba..c858dfb4703 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -36,7 +36,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:t:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 78f7123f945..57face8f408 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -80,7 +80,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp index 26d061f6266..6324c4ae295 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp @@ -33,7 +33,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp index b0d8dcec52e..0fe5ce0f48c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp @@ -82,7 +82,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp index 91d4ab6c68f..4a3e1c096d5 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp @@ -26,12 +26,12 @@ static bool go = false; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, char* argv[]); + virtual int parse_args (int argc, ACE_TCHAR* argv[]); }; int -Consumer_Client::parse_args (int argc, char *argv[]) +Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter argcon (argc, argv); ACE_Get_Opt get_opts (argcon.get_argc (), diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp index 21b14956726..06d92324391 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp @@ -78,12 +78,12 @@ private: class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, char* argv[]); + virtual int parse_args (int argc, ACE_TCHAR* argv[]); }; int -Supplier_Client::parse_args (int argc, char *argv[]) +Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter argcon (argc, argv); ACE_Get_Opt get_opts (argcon.get_argc (), diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index e275cc1d742..548b7cc248d 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -37,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:l:h:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index acb6e1cc7d1..99ad2a417f2 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -94,7 +94,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index be996896ca6..0932797a96c 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -26,7 +26,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 9a9dbd885e1..2fea44d1b94 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -85,7 +85,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp index 6552152f279..e92491f132f 100644 --- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp @@ -32,7 +32,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:")); int c; while ((c = get_opts ()) != -1) @@ -92,12 +92,12 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int status = 0; - + try { Consumer_Client client; status = client.init (argc, argv); - + if (status != 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -139,14 +139,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "\nConsumer waiting for events...\n")); FILE* ready_file = ACE_OS::fopen (ready, "w"); - + if (ready_file == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open ready file for writing\n"), 1); } - + ACE_OS::fprintf (ready_file, "ready\n"); ACE_OS::fclose (ready_file); diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp index 659d9c8d1b4..b4825f1c110 100644 --- a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp @@ -35,7 +35,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index eacf2f752e1..51d5e79fbd4 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -37,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:c:f")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 7799a485fc9..ae229073231 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -82,7 +82,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:fc:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:fc:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index b3f3cc5f1c8..4e5ad4a400b 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -27,7 +27,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ok:e:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index e274e2ca58f..04cd1895217 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -70,7 +70,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index a71dd25e495..b3e7984489b 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -24,7 +24,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ok:e:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ok:e:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index 20c170b7014..daebf28aeba 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -70,7 +70,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp index 53ef8ed7bfc..a5c1cf55c5d 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp @@ -78,7 +78,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index d036e8bd97a..de2e3a3eff2 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -761,7 +761,7 @@ Consumer_Main::~Consumer_Main () } int -Consumer_Main::parse_args (int argc, char *argv[]) +Consumer_Main::parse_args (int argc, ACE_TCHAR *argv[]) { int result = 0; int narg = 1; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index 68bb86c9588..c508444f5e6 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -168,7 +168,7 @@ class Consumer_Main Consumer_Main (); ~Consumer_Main (); - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); int parse_single_arg (int argc, char *argv[]); int init (int argc, char *argv[]); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 7d13ccea09a..00a8ada8858 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -205,7 +205,7 @@ Supplier_Main::~Supplier_Main () } int -Supplier_Main::parse_args (int argc, char *argv[]) +Supplier_Main::parse_args (int argc, ACE_TCHAR *argv[]) { int result = 0; int narg = 1; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index e1efe3c25a8..ec3a3ffd4a4 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -83,7 +83,7 @@ class Supplier_Main Supplier_Main (); ~Supplier_Main (); - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); int parse_single_arg (int argc, char *argv[]); int init (int argc, char *argv[]); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index bdbd8911ad7..078b3512fce 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -36,7 +36,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:l:h:d:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 77f2e5c4bde..e3b37a52678 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -81,7 +81,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:d"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:d")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 1bcf86a485e..ae1eb6f7f2f 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -37,7 +37,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:c:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:l:h:d:c:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index 16363e004f5..8a65de812de 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -82,7 +82,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 04ac603b753..fdb5f4f86fd 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -30,7 +30,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "fe:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("fe:")); int x; while ((x = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index 9e322c7cdb6..51dd826d741 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -31,7 +31,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:s:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:s:e:")); int x; while ((x = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index ae1c957d087..e5eb3ba8d3b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -73,7 +73,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "e:f:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("e:f:")); int x; while ((x = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp index 5e9736dc7aa..9ace0c63199 100644 --- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp @@ -22,14 +22,14 @@ static Notify_Structured_Push_Consumer* consumer_1 = 0; class Consumer_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, char* argv[]); + virtual int parse_args (int argc, ACE_TCHAR* argv[]); }; int -Consumer_Client::parse_args (int argc, char *argv[]) +Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp index 075533eb2c9..ab29a751f51 100644 --- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp @@ -33,41 +33,41 @@ public: , started_(false) { } - + void go (void) { started_ = true; } - + void done (void) { started_ = false; } - + void wait_for_startup() { while (! started_) { ACE_Time_Value tv(0, 100 * 1000); // 100ms orb_->run(tv); } - } - + } + private: CORBA::ORB_ptr orb_; - bool started_; + bool started_; }; class Supplier_Client : public Notify_Test_Client { public: - virtual int parse_args (int argc, char* argv[]); + virtual int parse_args (int argc, ACE_TCHAR* argv[]); }; int -Supplier_Client::parse_args (int argc, char *argv[]) +Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) @@ -171,14 +171,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) sig_i* sig_impl; ACE_NEW_RETURN (sig_impl, sig_i (orb), 1); - PortableServer::ServantBase_var owner_transfer(sig_impl); + PortableServer::ServantBase_var owner_transfer(sig_impl); CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in ()); - PortableServer::ObjectId_var id = + PortableServer::ObjectId_var id = root_poa->activate_object (sig_impl); object = root_poa->id_to_reference (id.in ()); @@ -213,7 +213,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "\nSupplier sent %d events.\n", max_events)); - ACE_OS::unlink (ior_output_file); + ACE_OS::unlink (ior_output_file); supplier_1->disconnect (); ec->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 35d2b5dd122..99a4f5f3459 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -178,7 +178,7 @@ TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver () } int -TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[]) +TAO_Notify_Tests_Driver::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 8068e00419a..0b2697da8f7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -117,7 +117,7 @@ public: protected: /// Parse command line parameters. - int parse_args (int argc, char *argv[]); + int parse_args (int argc, ACE_TCHAR *argv[]); /// The command builder TAO_Notify_Tests_Command_Builder* cmd_builder_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index aed91f8c021..8d2e6657bc4 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -41,7 +41,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:c:e:f"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:c:e:f")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 1f940d5642c..6763b681d81 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -81,7 +81,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index 9a35b4bcd02..7d39cac8653 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -39,7 +39,7 @@ public: int Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:e:c:f"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:e:c:f")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index 6b035b501e5..bbe94967909 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -81,7 +81,7 @@ public: int Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:e:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index af79db536e1..414806049d2 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -68,11 +68,11 @@ ACE_RCSID( * than those specified above. */ int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { /// We set the '-' flag for getopts because we have to do this /// parsing before the ORB does it's parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-B:R:A:X:N:C:F:T:?:")); int c; while ((c = get_opts ()) != -1) { diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index 0c572f33c66..9e04feb078f 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -42,7 +42,7 @@ ORB_Thread(CORBA::ORB_var orb) : orb_(orb) } int -svc(void) +svc(void) { try @@ -66,12 +66,12 @@ private: int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { // We set the '-' flag for getopts because we have to do // this parsing before the ORB does it's //parsing, and we'd confuse it to reorder - ACE_Get_Opt get_opts (argc, argv, "-:N:F:S:T:A:X:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-:N:F:S:T:A:X:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index 78edcb2ebd3..eac30d74b77 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -26,7 +26,7 @@ const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, " int parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index 6bc83b4218a..bb0f65bbb50 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -24,7 +24,7 @@ const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " int parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "n:"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:")); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index af64450f88d..39cc70f24cc 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -18,9 +18,9 @@ void do_nothing (void) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index a6f4ff7c4d5..53dcd5df0c3 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -12,9 +12,9 @@ const char *ior_output_file = 0; int no_iterations = 10; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:i:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 844af0f98cb..c3eb2a47b52 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -15,9 +15,9 @@ long data_size = 3461724; bool shutdown_server = false; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:d:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:i:d:x")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index b12b2543792..c45cef8de73 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -40,9 +40,9 @@ private: static int n_threads = 1; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:t:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:t:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp index cf135212f1e..2b17ba02a20 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp @@ -97,9 +97,9 @@ secure_invocation_test (CORBA::Object_ptr object) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "nk:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("nk:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp index 6ecebab4999..b164bf3432d 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp @@ -13,9 +13,9 @@ const char *ior_output_file = 0; const char *cert_file = "cacert.pem"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index 840a7f574a4..7c453ff0a89 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -17,9 +17,9 @@ CORBA::Boolean call_shutdown = 0; int wait_time = 10; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "sk:w:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("sk:w:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 891e73774b4..2e9a8cb7a34 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -14,9 +14,9 @@ const char *ior_output_file = 0; const char *cert_file = "cacert.pem"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp index d71169fbc8a..1e289e3d0a0 100644 --- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp @@ -15,7 +15,7 @@ CORBA::Short endpoint_port = 12345; int verbose = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { for (int c = 1; c < argc; c++) { if (ACE_OS::strcasecmp(argv[c],"-o") == 0) diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp index 56d23fe4eb9..c293492f955 100644 --- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp @@ -13,7 +13,7 @@ int verbose = 0; bool as_server = true; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { for (int c = 1; c < argc; c++) { if (ACE_OS::strcasecmp(argv[c],"-o") == 0) diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index 8fdd9e230f0..c5b98cc5b3b 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -10,9 +10,9 @@ int do_shutdown = 0; int nthreads = 5; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:i:x")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp index fd2a9c66c1f..e435a962084 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp @@ -8,9 +8,9 @@ const char *ior_output_file = 0; int nthreads = 4; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index 2ab78193c18..3408178ec0d 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -12,9 +12,9 @@ int do_shutdown = 0; int nthreads = 5; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:x"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:n:i:x")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp index 57989276cdd..7c12307a9d3 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp @@ -12,9 +12,9 @@ char *another_table_name = 0; int nthreads = 4; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:o:n:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("i:o:n:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index 5e5047464c3..262ea8cf79d 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -97,9 +97,9 @@ secure_invocation_test (CORBA::Object_ptr object) } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 26c1e5ee695..0c880a614ec 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -13,9 +13,9 @@ const char *ior_output_file = 0; const char *cert_file = "cacert.pem"; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index f4df2a687ee..e20b9d5e3ce 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -86,7 +86,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 85957bd519c..2723d35b540 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -86,7 +86,7 @@ CosNaming_Client::CosNaming_Client (void) int CosNaming_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:l"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:l")); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index a5b33e6dbab..a1af8062c87 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -228,7 +228,7 @@ Client_i::read_ior (char *filename) int Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "dn:f:xk:"); + ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:f:xk:")); int c; int result; diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 7cf8f596609..d7040f65067 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -18,7 +18,7 @@ parse_args (int argc, char *argv[], CORBA::Boolean& verbose) { int opt; - ACE_Get_Opt get_opt (argc, argv, "fq"); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("fq")); verbose = 1; while ((opt = get_opt ()) != EOF) |