diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 08:02:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 08:02:27 +0000 |
| commit | 3ccd3caa66a249f02abfe439d4bc44bc855cfb99 (patch) | |
| tree | 3bb6590023a07cdf663eeec501b54c46f26c9e21 | |
| parent | 51ddf0daf03683512eb41a0e7f7a7823ef10f2eb (diff) | |
| download | ATCD-3ccd3caa66a249f02abfe439d4bc44bc855cfb99.tar.gz | |
Mon Sep 29 07:59:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
87 files changed, 209 insertions, 119 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 967cc781cc4..b57c1446929 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,93 @@ +Mon Sep 29 07:59:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp + * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp + * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h + * orbsvcs/IFR_Service/be_init.cpp + * orbsvcs/IFR_Service/IFR_Service.cpp + * orbsvcs/IFR_Service/IFR_Service.h + * orbsvcs/ImplRepo_Service/Activator_Options.cpp + * orbsvcs/ImplRepo_Service/Activator_Options.h + * orbsvcs/ImplRepo_Service/Locator_Options.cpp + * orbsvcs/ImplRepo_Service/Locator_Options.h + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp + * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp + * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h + * 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/Naming_Service/NT_Naming_Server.cpp + * orbsvcs/Notify_Service/NT_Notify_Server.cpp + * orbsvcs/orbsvcs/AV/default_resource.cpp + * orbsvcs/orbsvcs/AV/default_resource.h + * orbsvcs/orbsvcs/AV/Protocol_Factory.h + * orbsvcs/orbsvcs/AV/QoS_UDP.h + * orbsvcs/orbsvcs/AV/Resource_Factory.h + * orbsvcs/orbsvcs/AV/RTCP.h + * orbsvcs/orbsvcs/AV/RTP.h + * orbsvcs/orbsvcs/AV/SCTP_SEQ.h + * orbsvcs/orbsvcs/AV/sfp.h + * orbsvcs/orbsvcs/AV/TCP.h + * orbsvcs/orbsvcs/AV/Transport.h + * orbsvcs/orbsvcs/AV/UDP.h + * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp + * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h + * orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp + * orbsvcs/performance-tests/RTEvent/lib/Client_Options.h + * orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp + * orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h + * orbsvcs/tests/Bug_2247_Regression/Manager.h + * orbsvcs/tests/CosEvent/Basic/Random.cpp + * orbsvcs/tests/CosEvent/Basic/Random.h + * orbsvcs/tests/Event/Basic/Random.cpp + * orbsvcs/tests/Event/Basic/Random.h + * orbsvcs/tests/Event/Performance/Inversion.h + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp + * orbsvcs/tests/FaultTolerance/IOGR/Manager.h + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h + * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp + * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h + * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp + * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h + * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp + * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h + * orbsvcs/tests/Notify/Basic/AdminProperties.cpp + * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp + * orbsvcs/tests/Notify/Basic/ConnectDisconnect.h + * orbsvcs/tests/Notify/Basic/Events.cpp + * orbsvcs/tests/Notify/Basic/Events.h + * orbsvcs/tests/Notify/Basic/IdAssignment.h + * orbsvcs/tests/Notify/Basic/LifeCycle.cpp + * orbsvcs/tests/Notify/Basic/LifeCycle.h + * orbsvcs/tests/Notify/Basic/MultiTypes.h + * orbsvcs/tests/Notify/Basic/Sequence.cpp + * orbsvcs/tests/Notify/Basic/Sequence.h + * orbsvcs/tests/Notify/Basic/Simple.cpp + * orbsvcs/tests/Notify/Basic/Simple.h + * orbsvcs/tests/Notify/lib/Command_Builder.cpp + * orbsvcs/tests/Notify/lib/Command_Builder.h + * orbsvcs/tests/Notify/lib/Command_Factory_T.h + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h + * 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/Property/client.cpp + * orbsvcs/tests/Property/client.h + * orbsvcs/tests/Security/InsecureReferences/test.cpp + * orbsvcs/tests/Time/Client_i.h + * orbsvcs/tests/Trading/colocated_test.cpp + ACE_TCHAR changes + Mon Sep 29 07:57:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Callback_Quoter/Consumer_Handler.h diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index d0a9ae82f5d..6b375411a02 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -25,7 +25,7 @@ IFR_Service::~IFR_Service (void) int IFR_Service::init (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { int result; try diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 993c1575559..a7fc21f7476 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -42,7 +42,7 @@ public: /// Initialize the IFR service. int init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); /// Shut down the IFR Service. int fini (void); diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp index 8ea3a129040..2b9652fa13a 100644 --- a/TAO/orbsvcs/IFR_Service/be_init.cpp +++ b/TAO/orbsvcs/IFR_Service/be_init.cpp @@ -5,7 +5,7 @@ #include "../../tao/Version.h" int -BE_save_orb_args (int &argc, char *argv[]) +BE_save_orb_args (int &argc, ACE_TCHAR *argv[]) { int i = 1; ACE_CString holder; @@ -95,7 +95,7 @@ BE_version (void) } TAO_IFR_BE_Export int -BE_init (int &argc, char *argv[]) +BE_init (int &argc, ACE_TCHAR *argv[]) { // Initialize BE global data object. ACE_NEW_RETURN (be_global, diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index e656d4bbda3..0a2494fedf6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -35,7 +35,7 @@ Activator_Options::Activator_Options () } int -Activator_Options::parse_args (int &argc, char *argv[]) +Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter shifter (argc, argv); @@ -175,7 +175,7 @@ Activator_Options::parse_args (int &argc, char *argv[]) } int -Activator_Options::init (int argc, char *argv[]) +Activator_Options::init (int argc, ACE_TCHAR *argv[]) { // Make an initial pass through and grab the arguments that we recognize. // This may also run the commands to install or remove the nt service. diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index 28bf7c9de03..f2159a51d9a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -51,7 +51,7 @@ public: Activator_Options (); /// Parse the command-line arguments and initialize the options. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); /// This version should only be used when run as an nt service. int init_from_registry(); @@ -84,7 +84,7 @@ public: private: /// Parses and pulls out arguments for the ImR - int parse_args (int &argc, char *argv[]); + int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. void print_usage (void) const; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 0d9dbefe97c..57a71e49e98 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -42,7 +42,7 @@ Options::Options () } int -Options::parse_args (int &argc, char *argv[]) +Options::parse_args (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter shifter (argc, argv); @@ -209,7 +209,7 @@ Options::parse_args (int &argc, char *argv[]) } int -Options::init (int argc, char *argv[]) +Options::init (int argc, ACE_TCHAR *argv[]) { // Make an initial pass through and grab the arguments that we recognize. // This may also run the commands to install or remove the nt service. diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index 4d7019bccf3..49450048482 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -51,7 +51,7 @@ public: Options (); /// Parse the command-line arguments and initialize the options. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); /// This version should only be used when run as an nt service. int init_from_registry(); @@ -96,7 +96,7 @@ public: private: /// Parses and pulls out arguments for the ImR - int parse_args (int &argc, char *argv[]); + int parse_args (int &argc, ACE_TCHAR *argv[]); /// Print the usage information. void print_usage (void) const; 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 a7234350433..7111f44eae5 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 @@ -91,7 +91,7 @@ Basic_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) } int -Basic_Logging_Service::init (int argc, char *argv[]) +Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[]) { // initialize the ORB. this->init_ORB (argc, argv); diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h index 8bb63d5fa73..2d8c7855d1b 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h @@ -39,7 +39,7 @@ class Basic_Logging_Service virtual ~Basic_Logging_Service (void); // Destructor. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. 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 08dd63f399d..5d3d64d821e 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 @@ -92,7 +92,7 @@ Event_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) } int -Event_Logging_Service::init (int argc, char *argv[]) +Event_Logging_Service::init (int argc, ACE_TCHAR *argv[]) { // initialize the ORB. this->init_ORB (argc, argv); diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h index 2104309ecee..18e9a139b10 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h @@ -40,7 +40,7 @@ class Event_Logging_Service virtual ~Event_Logging_Service (void); // Destructor. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. 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 36b34b6e7b6..a2a0f65fea6 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 @@ -107,7 +107,7 @@ Notify_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[]) } int -Notify_Logging_Service::init (int argc, char *argv[]) +Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[]) { // initialize the ORB. if (this->init_ORB (argc, argv) != 0) 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 31f96fdcdc0..52c597c4dbc 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 @@ -44,7 +44,7 @@ class Notify_Logging_Service virtual ~Notify_Logging_Service (void); // Destructor. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); // Initializes the Telecom Log Service. // Returns 0 on success, -1 on error. 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 dbbafbeabb7..c0131bfe9a3 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 @@ -25,7 +25,7 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void) } void -RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]) +RTEvent_Logging_Service::init_ORB (int& argc, ACE_TCHAR *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 66130cfca55..c5d3dcbe54d 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -53,11 +53,11 @@ public: Options (void); ~Options (void); - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); private: void parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void print_usage_and_die (void); private: diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 9bccf77c4e9..b0340ba745d 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -57,7 +57,7 @@ public: Options (void); ~Options (void); - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); private: void parse_args (int argc, ACE_TCHAR *argv[]); 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 a8cf069628f..4e3e77e72d8 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 @@ -88,7 +88,7 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv []) } void -RtEC_Based_CosEC::startup (int argc, char *argv[]) +RtEC_Based_CosEC::startup (int argc, ACE_TCHAR *argv[]) { ACE_DEBUG ((LM_DEBUG, "Starting up the CosEvent Service...\n")); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h index 38e44aebee7..fbb69f5ab27 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h @@ -43,7 +43,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase int parse_args (int argc, char *argv []); // Parses the command line arguments. - void startup (int argc, char *argv[]); + void startup (int argc, ACE_TCHAR *argv[]); // Initializes the COS Event Service. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp index dab214bd046..c7a7871b132 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -42,7 +42,7 @@ Basic::~Basic (void) } void -Basic::init (int argc, char *argv[]) +Basic::init (int argc, ACE_TCHAR *argv[]) { this->init_ORB (argc, argv); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h index 333049506ef..37f7657a5ac 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h @@ -36,7 +36,7 @@ public: ~Basic (void); // Destructor. - void init (int argc, char *argv[]); + void init (int argc, ACE_TCHAR *argv[]); // Starts up an ORB and the CosEC. // Returns 0 on success, -1 on error. @@ -48,7 +48,7 @@ public: // Closes down the CosEC. private: - void init_ORB (int argc, char *argv[]); + void init_ORB (int argc, ACE_TCHAR *argv[]); // initializes the ORB. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp index b16dbd64c78..3f3cf679465 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -17,7 +17,7 @@ Multiple::~Multiple (void) } int -Multiple::init (int argc, char *argv[]) +Multiple::init (int argc, ACE_TCHAR *argv[]) { if (init_ORB (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h index 3248946ce78..1f9a29b5494 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -39,7 +39,7 @@ class Multiple virtual ~Multiple (void); // Destructor. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); // Calls parse_args, Starts up an ORB, gets hold of the Event Service. // Returns 0 on success, -1 on error. @@ -60,7 +60,7 @@ class Multiple // The name with which to locate the Event Service. private: - int init_ORB (int argc, char *argv[]); + int init_ORB (int argc, ACE_TCHAR *argv[]); // initializes the ORB. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index f18774d3006..2dae263ace9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -87,7 +87,7 @@ public: /// Initialization hook. TAO_AV_Flow_Protocol_Factory (void); virtual ~TAO_AV_Flow_Protocol_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 27a585f0ff4..fb5b38ebb37 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -35,7 +35,7 @@ class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory public: TAO_AV_UDP_QoS_Factory (void); virtual ~TAO_AV_UDP_QoS_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); @@ -255,7 +255,7 @@ class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory public: TAO_AV_UDP_QoS_Flow_Factory (void); virtual ~TAO_AV_UDP_QoS_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 58688376837..859acc4edcd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -121,7 +121,7 @@ class TAO_AV_Export TAO_AV_RTCP_Flow_Factory public: TAO_AV_RTCP_Flow_Factory (void); virtual ~TAO_AV_RTCP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 8cc883386a4..8da7cacf08b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -405,7 +405,7 @@ public: /// Initialization hook. TAO_AV_RTP_Flow_Factory (void); virtual ~TAO_AV_RTP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index a14a9087531..4b32ac58a85 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -31,11 +31,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The AV Streams resource factory loads the * pluggable transport and flow protocol factories * in the corresponding factory sets. - * + * * */ class TAO_AV_Export TAO_AV_Resource_Factory -: public ACE_Service_Object +: public ACE_Service_Object { public: @@ -44,8 +44,8 @@ public: */ //@{ /// Dynamic linking hook - virtual int init (int argc, char *argv[]) = 0; - + virtual int init (int argc, ACE_TCHAR *argv[]) = 0; + }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 5f8de3cca6e..2582eedbb53 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -48,7 +48,7 @@ public: /// Initialization hook. TAO_AV_SCTP_SEQ_Factory (void); virtual ~TAO_AV_SCTP_SEQ_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -284,7 +284,7 @@ public: /// Initialization hook. TAO_AV_SCTP_SEQ_Flow_Factory (void); virtual ~TAO_AV_SCTP_SEQ_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 1f51a7329be..f9993653b3b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -33,7 +33,7 @@ public: /// Initialization hook. TAO_AV_TCP_Factory (void); virtual ~TAO_AV_TCP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -263,7 +263,7 @@ public: /// Initialization hook. TAO_AV_TCP_Flow_Factory (void); virtual ~TAO_AV_TCP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index c6e3f63ba57..985d61b333c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -328,7 +328,7 @@ public: /// Initialization hook. TAO_AV_Transport_Factory (void); virtual ~TAO_AV_Transport_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index d7137bdd92d..0fe25d7d2c5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -32,7 +32,7 @@ public: /// Initialization hook. TAO_AV_UDP_Factory (void); virtual ~TAO_AV_UDP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -270,7 +270,7 @@ public: /// Initialization hook. TAO_AV_UDP_Flow_Factory (void); virtual ~TAO_AV_UDP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 8db6c6c5644..d26bc33bb7c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -41,7 +41,7 @@ TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void) } int -TAO_AV_Default_Resource_Factory::init (int argc, char *argv[]) +TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 0bf2a7b930f..44d5352c388 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The AV Streams resource factory loads the * pluggable transport and flow protocol factories * in the corresponding factory sets. - * + * * */ @@ -53,8 +53,8 @@ public: */ //@{ /// Dynamic linking hook - virtual int init (int argc, char *argv[]); - + virtual int init (int argc, ACE_TCHAR *argv[]); + }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 35ab492f34f..448deee0337 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -288,7 +288,7 @@ class TAO_AV_Export TAO_AV_SFP_Factory : public TAO_AV_Flow_Protocol_Factory public: TAO_AV_SFP_Factory (void); virtual ~TAO_AV_SFP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); // Initialization hook. virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 8220dcb8478..f5ef0a9ffa6 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -29,7 +29,7 @@ TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) } int -TAO_Concurrency_Loader::init (int argc, char *argv[]) +TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 302c7cfd25e..4482671e3db 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -41,7 +41,7 @@ public: /// Called by the Service Configurator framework to initialize the /// Event Service. Defined in <ace/Service_Config.h> - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> @@ -50,7 +50,7 @@ public: /// This function call initializes the Concurrency Service given a /// reference to the ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[]); + int argc, ACE_TCHAR *argv[]); protected: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index c8e69760669..8b53e8a9882 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -15,7 +15,7 @@ ACE_RCSID (TAO_PERF_RTEC, Client_Options, "$Id$") -Client_Options::Client_Options (int &argc, char *argv[]) +Client_Options::Client_Options (int &argc, ACE_TCHAR *argv[]) : ior ("file://test.ior") , iterations (1000) , nthreads (0) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h index 8d12ab4fafc..d4c6e886ffb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h @@ -28,7 +28,7 @@ class TAO_RTEC_Perf_Export Client_Options { public: /// Constructor - Client_Options (int &argc, char *argv[]); + Client_Options (int &argc, ACE_TCHAR *argv[]); const char *ior; int iterations; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp index 65c80374a6b..9150dbcf94c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp @@ -16,7 +16,7 @@ ACE_RCSID (TAO_PERF_RTEC, ORB_Holder, "$Id$") -ORB_Holder::ORB_Holder (int &argc, char *argv[], +ORB_Holder::ORB_Holder (int &argc, ACE_TCHAR *argv[], const char *orb_id) : orb_ (CORBA::ORB_init (argc, argv, orb_id)) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h index fd3fc10c0f4..a5c81145e7a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h @@ -26,7 +26,7 @@ class TAO_RTEC_Perf_Export ORB_Holder { public: /// Constructor - ORB_Holder (int &argc, char *argv[], + ORB_Holder (int &argc, ACE_TCHAR *argv[], const char *orb_id = 0); /// Destructor diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index dcc578e1756..0e773d911fc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -45,7 +45,7 @@ class TAO_TS_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac /// Initialization hook. TimeStamp_Protocol_Factory (void); virtual ~TimeStamp_Protocol_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); // Note : Some platforms still don't support Covariant returns virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h index ca3bcae2b41..05b1f719326 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h @@ -20,7 +20,7 @@ public: // Ctor void init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Initialize the ORB, POA etc. diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index adae71620ac..a7d07dc54a5 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -40,7 +40,7 @@ RND_Driver::RND_Driver (void) } int -RND_Driver::run (int argc, char *argv[]) +RND_Driver::run (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 9287f5bc7f1..8e67e20bdcd 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -130,7 +130,7 @@ class RND_Driver public: RND_Driver (void); - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); // Run the test void timer (const CORBA::Any &e); diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 8f6a2f92089..80db85284cb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -47,7 +47,7 @@ RND_Driver::RND_Driver (void) } int -RND_Driver::run (int argc, char *argv[]) +RND_Driver::run (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 5ef4c3b5652..566080cc4b1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -128,7 +128,7 @@ public: RND_Driver (void); /// Run the test - int run (int argc, char *argv[]); + int run (int argc, ACE_TCHAR *argv[]); /// The main timer has expired void timer (const RtecEventComm::Event &e); diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h index 8bb062db7c2..c73eb43bbc8 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h @@ -36,7 +36,7 @@ public: // Constructor // = The EC_Driver methods - int parse_args (int &argc, char *argv[]); + int parse_args (int &argc, ACE_TCHAR *argv[]); // Parse the arguments, but override the number of consumers. // The options controlling the event types are ignored, and only two // consumers are created. diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index 72f69f22115..2abf3d4c1f7 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -44,7 +44,7 @@ Server_Request_Interceptor::forward_references ( EINVAL), CORBA::COMPLETED_NO); - char *argv[] = {NULL}; + ACE_TCHAR *argv[] = {NULL}; int argc = 0; // Fetch the ORB having been initialized in main() diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index 9791e7e5423..b674782986f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -32,7 +32,7 @@ class Manager { public: void init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Initialize the ORB, POA etc. 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 6e4f7651fcc..d4d90a606ca 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -23,7 +23,7 @@ IFR_DII_Client::~IFR_DII_Client (void) int IFR_DII_Client::init (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv); @@ -88,7 +88,7 @@ IFR_DII_Client::run (void) int IFR_DII_Client::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Get_Opt opts (argc, argv, ACE_TEXT("dn")); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h index d236e868046..91a47639adb 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h @@ -19,7 +19,7 @@ public: ~IFR_DII_Client (void); int init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Initialize the client. int run (void); @@ -27,7 +27,7 @@ public: private: int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Process the command line arguments. int find_interface_def (void); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 5e7e3b47923..249017d05b0 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -258,7 +258,7 @@ IDL3_Client::~IDL3_Client (void) int IDL3_Client::init (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv); @@ -328,7 +328,7 @@ IDL3_Client::run (void) int IDL3_Client::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Get_Opt opts (argc, argv, ACE_TEXT("d")); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h index cf1d3dafaaa..16f3ebafd93 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h @@ -38,7 +38,7 @@ public: // Destructor int init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Initialize the ORB and get the IFR object reference. int run (void); @@ -46,7 +46,7 @@ public: private: int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Process the command line arguments. int component_test (void); 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 a6262595679..faa84a55cb6 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -27,7 +27,7 @@ Latency_Query_Client::~Latency_Query_Client (void) int Latency_Query_Client::init (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { try { @@ -148,7 +148,7 @@ Latency_Query_Client::run (void) int Latency_Query_Client::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Get_Opt opts (argc, argv, ACE_TEXT("dhi:")); int c; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h index 1400b2bd059..4e0c3bf6c4f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h @@ -38,14 +38,14 @@ public: // Destructor int init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Initialize the ORB and get the IFR object reference. int run (void); // Execute test code. private: int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Process the command line arguments. int populate_ifr (void); 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 c30a2860334..6f494c4f02b 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 @@ -28,7 +28,7 @@ BasicLog_Test::~BasicLog_Test (void) } int -BasicLog_Test::init (int argc, char *argv[]) +BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index 37be05b9ec3..1c9ed470240 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -39,7 +39,7 @@ class BasicLog_Test ~BasicLog_Test(void); // destructor - int init(int argc, char *argv[]); + int init(int argc, ACE_TCHAR *argv[]); int test_CreateLog(CORBA::ULongLong maxSize = MAX_LOG_SIZE); @@ -114,7 +114,7 @@ private: init_factory (void); int - parse_args(int argc, char *argv[]); + parse_args(int argc, ACE_TCHAR *argv[]); // command line argument parser int write_records(CORBA::ULongLong numberOfRecordsToWrite); diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index d582c0052d3..ce90a196c92 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -141,7 +141,7 @@ AdminProperties::~AdminProperties (void) } int -AdminProperties::parse_args(int argc, char *argv[]) +AdminProperties::parse_args(int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index 365673a6870..f238ada7389 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -132,7 +132,7 @@ ConnectDisconnect::init (int argc, } int -ConnectDisconnect::parse_args(int argc, char *argv[]) +ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index d7900b95b72..522a7848394 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -70,7 +70,7 @@ public: // Keeps track of how many objects were destroyed. int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); int init (int argc, char *argv []); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 439ee179537..3c5e9f1b324 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -121,7 +121,7 @@ Events::init (int argc, int Events::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index fe3e038ba46..45027fda106 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -68,7 +68,7 @@ public: virtual ~Events (void); int parse_args (int argc, - char *argv[]) ; + ACE_TCHAR *argv[]) ; int init (int argc, char *argv []); diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 5a7d1afdc15..ccf1d8f1873 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -25,9 +25,9 @@ public: ~IdAssignment (void); int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void run_test (void); private: diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index ab20982811f..4922ba459c7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -24,7 +24,7 @@ LifeCycle::~LifeCycle (void) int LifeCycle::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); @@ -61,7 +61,7 @@ LifeCycle::parse_args (int argc, } void -LifeCycle::init (int argc, char *argv[]) +LifeCycle::init (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h index 9d4b39b17d8..87150f7377c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h @@ -23,10 +23,10 @@ public: ~LifeCycle (void); void init (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void run_test (void); int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); private: void create_ec (void); diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index 1d8e3af7ddf..658ed84c2fd 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -90,7 +90,7 @@ public: void on_received_event (MultiTypes_SequencePushConsumer* consumer); int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); int init (int argc, char *argv []); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 38a21fa2230..2ee427c490a 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -129,7 +129,7 @@ Sequence::init (int argc, int Sequence::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 08e499df957..6e1b992df89 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -67,7 +67,7 @@ public: virtual ~Sequence (void); int parse_args (int argc, - char *argv[]) ; + ACE_TCHAR *argv[]) ; int init (int argc, char *argv []); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index 5b9682bbb34..e01e5275f00 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -102,7 +102,7 @@ Simple_Test::init (int argc, int Simple_Test::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index ef89670dfe7..0f45fd805db 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -69,7 +69,7 @@ public: virtual ~Simple_Test (void); int parse_args (int argc, - char *argv[]) ; + ACE_TCHAR *argv[]) ; int init (int argc, char *argv []); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index de2e3a3eff2..3c9f15e0e97 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -798,7 +798,7 @@ Consumer_Main::parse_args (int argc, ACE_TCHAR *argv[]) } int -Consumer_Main::parse_single_arg (int argc, char *argv[]) +Consumer_Main::parse_single_arg (int argc, ACE_TCHAR *argv[]) { int consumed = 0; if (ACE_OS::strcasecmp (argv[0], "-any") == 0) @@ -873,7 +873,7 @@ void Consumer_Main::usage(FILE * out)const //FUZZ: enable check_for_lack_ACE_OS } -int Consumer_Main::init (int argc, char *argv[]) +int Consumer_Main::init (int argc, ACE_TCHAR *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index c508444f5e6..21dfc9e8ac9 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -169,9 +169,9 @@ class Consumer_Main ~Consumer_Main (); int parse_args (int argc, ACE_TCHAR *argv[]); - int parse_single_arg (int argc, char *argv[]); + int parse_single_arg (int argc, ACE_TCHAR *argv[]); - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); int run (void); int fini (void); void usage (FILE * log) const; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 00a8ada8858..25293432de5 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -241,7 +241,7 @@ Supplier_Main::parse_args (int argc, ACE_TCHAR *argv[]) } int -Supplier_Main::parse_single_arg (int argc, char *argv[]) +Supplier_Main::parse_single_arg (int argc, ACE_TCHAR *argv[]) { int consumed = 0; if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-v")) == 0) @@ -316,7 +316,7 @@ void Supplier_Main::usage(FILE * log)const //FUZZ: enable check_for_lack_ACE_OS } -int Supplier_Main::init (int argc, char *argv[]) +int Supplier_Main::init (int argc, ACE_TCHAR *argv[]) { this->orb_ = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index ec3a3ffd4a4..4f67cb6481e 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -84,9 +84,9 @@ class Supplier_Main ~Supplier_Main (); int parse_args (int argc, ACE_TCHAR *argv[]); - int parse_single_arg (int argc, char *argv[]); + int parse_single_arg (int argc, ACE_TCHAR *argv[]); - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); int run (void); int fini (void); void usage (FILE * log) const; diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index 6d40e44cef1..d7e33536675 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -19,7 +19,7 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder () } int -TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[]) +TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index dc4fb81b5f0..5f2553dc246 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -46,7 +46,7 @@ public: ~TAO_Notify_Tests_Command_Builder (); /// = Service_Object virtual method overloads. - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int fini (void); /// Register the factory against the name of the factory. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index a40f1bc7142..70c81193233 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -45,7 +45,7 @@ public: ~TAO_Notify_Tests_Command_Factory_T (); /// = Service_Object virtual method overloads. - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int fini (void); /// Create the <COMMAND> command. diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index c567281ba81..143aa96bd2d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -27,7 +27,7 @@ static bool consumer_is_done = false; int RedGreen_Test::parse_args (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 188987c5c46..123861cb59e 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -71,7 +71,7 @@ class RedGreen_Test RedGreen_Test (void); int parse_args (int argc, - char *argv[]); + ACE_TCHAR *argv[]); void dump_results (void); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 8795fa6be56..d927b91212d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -301,7 +301,7 @@ Notify_Throughput::init (int argc, char* argv []) } int -Notify_Throughput::parse_args(int argc, char *argv[]) +Notify_Throughput::parse_args(int argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 10be46fd760..3cfcb68e8d6 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -135,7 +135,7 @@ public: Notify_Throughput (void); virtual ~Notify_Throughput (); - int parse_args(int argc, char *argv[]) ; + int parse_args(int argc, ACE_TCHAR *argv[]) ; int init (int argc, char *argv []); // initialization. diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index c037bd08287..ef1d75e82c6 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -27,7 +27,7 @@ ACE_RCSID(CosPropertyService, client, "$Id$") int Client::init (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { // Init the ORB. manager_.init (argc, argv); diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 68c2422f28c..9ab696bd6c1 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -56,7 +56,7 @@ public: protected: int bind_to_remote_mmdevice (int argc, - char *argv[]); + ACE_TCHAR *argv[]); // Bind to the remote MMDevice. // = Property Testing. diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp index 4cf5a488f06..0047f19e114 100644 --- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp @@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } int -gen_objref (int argc, char *argv[]) +gen_objref (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb; CORBA::Object_var obj; @@ -119,7 +119,7 @@ gen_objref (int argc, char *argv[]) } int -parse_objref (int argc, char *argv[]) +parse_objref (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb; CORBA::Object_var obj; diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index e5864a956c0..698541157c0 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -41,7 +41,7 @@ public: int run (void); // Execute client example code. - int init (int argc, char *argv[]); + int init (int argc, ACE_TCHAR *argv[]); // Initialize the client communication endpoint with server. void test_for_secure_universal_time (void); diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index d7040f65067..5278a192b6b 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -14,7 +14,7 @@ ACE_RCSID (Trading, "$Id$") void -parse_args (int argc, char *argv[], +parse_args (int argc, ACE_TCHAR *argv[], CORBA::Boolean& verbose) { int opt; |