diff options
Diffstat (limited to 'TAO/orbsvcs/examples')
76 files changed, 378 insertions, 232 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp index 72c9ebc763b..be9ebfc1a76 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp @@ -4,6 +4,7 @@ #include "CosEventChannelFactoryC.h" #include "orbsvcs/CosNamingC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" class FactoryClient { @@ -21,7 +22,7 @@ public: virtual ~FactoryClient (void); // destructor. - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); @@ -87,7 +88,7 @@ FactoryClient::~FactoryClient (void) void FactoryClient::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -364,16 +365,17 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DEBUG ((LM_DEBUG, "The FactoryClient will test the Cos Event Channel Factory\n")); ACE_TRY_NEW_ENV { FactoryClient ft; - ft.init_ORB (argc, - argv + ft.init_ORB (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp index 845ee110d77..50a842d3f74 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp @@ -19,9 +19,9 @@ FactoryDriver::~FactoryDriver (void) } int -FactoryDriver::parse_args (int argc, char *argv []) +FactoryDriver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dr:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dr:"); int c = 0; while ((c = get_opts ()) != -1) @@ -50,7 +50,7 @@ FactoryDriver::parse_args (int argc, char *argv []) } int -FactoryDriver::start (int argc, char *argv []) +FactoryDriver::start (int argc, char *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h index 97d837a7c2e..adec5218b49 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h @@ -45,14 +45,14 @@ class FactoryDriver ~FactoryDriver (void); // Destructor. - int start (int argc, char *argv []); + int start (int argc, char *argv[]); // Start the driver. int stop (void); //Stop the driver. protected: - int parse_args (int argc, char *argv []); + int parse_args (int argc, char *argv[]); // Parse the command-line arguments and set options. const char* factoryName_; diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp index 2ca49905292..c2b9a007fbc 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp @@ -3,12 +3,15 @@ #include "FactoryDriver.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); FactoryDriver driver; - driver.start (argc, argv); + driver.start (convert.get_argc(), convert.get_ASCII_argv()); return 0; } 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 68f393240e7..cba856ea3b0 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 @@ -3,6 +3,7 @@ #include "RtEC_Based_CosEC.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" RtEC_Based_CosEC::RtEC_Based_CosEC (void) : service_name ("CosEventService"), @@ -18,7 +19,7 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void) } void -RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] +RtEC_Based_CosEC::init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, @@ -46,9 +47,9 @@ RtEC_Based_CosEC::init_ORB (int& argc, char *argv [] } int -RtEC_Based_CosEC::parse_args (int argc, char *argv []) +RtEC_Based_CosEC::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "t:n:e:o:p:r"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "t:n:e:o:p:r"); int opt; while ((opt = get_opt ()) != EOF) @@ -276,16 +277,17 @@ RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); RtEC_Based_CosEC service; ACE_TRY_NEW_ENV { - service.startup (argc, - argv + service.startup (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; 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 72f1bd8224f..eb9333093c4 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 @@ -40,7 +40,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase virtual ~RtEC_Based_CosEC (void); // Destructor. - int parse_args (int argc, char *argv []); + int parse_args (int argc, char *argv[]); // Parses the command line arguments. void startup (int argc, char *argv[] @@ -68,7 +68,7 @@ protected: virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL); // Deactivates the rtec. - void init_ORB (int& argc, char *argv [] + void init_ORB (int& argc, char *argv[] ACE_ENV_ARG_DECL); // initialize the ORB. 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 bd0b2585f86..976da8ab3b3 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp @@ -3,16 +3,19 @@ #include "Basic.h" #include "CosEvent_Utilities.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Basic basic; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - basic.init (argc, argv ACE_ENV_ARG_PARAMETER); + basic.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; basic.run (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -61,7 +64,7 @@ Basic::init (int argc, char *argv[] } void -Basic::init_ORB (int argc, char *argv [] +Basic::init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, 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 9cdb697eff1..1f6d6b73702 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -3,6 +3,7 @@ #include "Consumer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" Consumer::Consumer () :event_count_ (1) @@ -11,9 +12,9 @@ Consumer::Consumer () } int -Consumer::parse_args (int argc, char *argv []) +Consumer::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:"); int opt; while ((opt = get_opt ()) != EOF) @@ -176,11 +177,13 @@ Consumer::init_Consumer (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer cons; - if (cons.init (argc, argv) == -1) + if (cons.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; if (cons.init_Consumer () == -1) diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index ce523fed960..651d825a153 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -69,7 +69,7 @@ public: // disconnect the consumer from the EC. // = CosEC_Multiple methods. - virtual int parse_args (int argc, char *argv []); + virtual int parse_args (int argc, char *argv[]); // Parse the command line options. private: 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 4af0b93b9aa..a67007ededc 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp @@ -37,7 +37,7 @@ Multiple::init (int argc, char *argv[]) } int -Multiple::init_ORB (int argc, char *argv []) +Multiple::init_ORB (int argc, char *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY 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..e0bca0efa5c 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h @@ -50,7 +50,7 @@ class Multiple // Closes down the ORB and exits. protected: - virtual int parse_args (int argc, char *argv []) = 0; + virtual int parse_args (int argc, char *argv[]) = 0; // Parse the command line arguments. CosEventChannelAdmin::EventChannel_ptr cos_ec_; 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 7d9a03c9261..0b232a783d4 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp @@ -3,6 +3,7 @@ #include "Supplier.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" Supplier::Supplier () : event_count_ (1) @@ -11,9 +12,9 @@ Supplier::Supplier () } int -Supplier::parse_args (int argc, char *argv []) +Supplier::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "n:c:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:"); int opt; while ((opt = get_opt ()) != EOF) @@ -170,11 +171,13 @@ Supplier::run (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supp; - if (supp.init (argc, argv) == -1) + if (supp.init (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; supp.run (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h index 29b213cd31f..9ef552599ce 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h @@ -63,7 +63,7 @@ public: // Sends the events to the EC. // = Multiple methods. - virtual int parse_args (int argc, char *argv []); + virtual int parse_args (int argc, char *argv[]); // Parses the command line arguments. private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index bcf4fcfc551..359f25fddcb 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -2,17 +2,20 @@ #include "Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 07a78aea874..cf07d735aea 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Simple, Service, @@ -14,8 +15,10 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_CEC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -23,10 +26,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -65,7 +68,7 @@ main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -99,7 +102,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "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 3886f6d085a..490ab33bf75 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -3,17 +3,20 @@ #include "Supplier.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Supplier, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index db6437a39bd..1143417a9f0 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -4,21 +4,23 @@ #include "orbsvcs/CosTypedEventChannelAdminC.h" #include "Country_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (CosEC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_obj = @@ -79,8 +81,7 @@ main (int argc, char* argv[]) const char* ior_file_name = "Consumer.ior"; FILE *output_file= - ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name), - ACE_LIB_TEXT("w")); + ACE_OS::fopen (ior_file_name, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc index cddcd128801..974ee82d6e3 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { + exename = Consumer requires += ec_typed_events source_files { Consumer.cpp @@ -10,6 +11,7 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { } project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { + exename = Supplier requires += ec_typed_events after += CosEC_TypedSimple_Consumer idl_files { diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index d384fad33cf..c61ee91be55 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,19 +3,21 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/CosTypedEventChannelAdminC.h" #include "CountryC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(CosEC_Examples, Supplier, "$Id:") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the event channel using the Naming Service. diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 7aff9a4a1bd..5e9e7766033 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" // IOR manipulation. #include "tao/IORManipulation/IORManip_Loader.h" @@ -19,7 +20,7 @@ const char *ior2 = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -41,20 +42,21 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int status = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Client ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (::parse_args (argc, argv) != 0) return -1; + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Start out with the first IOR. Interaction with the second // IOR occurs during the various interceptions executed during diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index 65c0587a9b7..359851764ec 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -9,13 +9,14 @@ #include "CrashPoint.h" #include "ORB_Initializer.h" #include "tao/ORBInitializer_Registry.h" +#include "ace/Argv_Type_Converter.h" const char *ior_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:"); int c; while ((c = get_opts ()) != -1) @@ -40,12 +41,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - if (::parse_args (argc, argv) != 0) return -1; + if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; ORB_Initializer *temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, @@ -60,7 +63,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -101,7 +104,7 @@ main (int argc, char *argv[]) poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - FILE *output_file= ACE_OS::fopen (ior_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 9b2da4d88c8..a96a0c6c277 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, char* argv[]) { - ACE_Get_Opt get_opts(argc, argv, "s:t:i:r:x:e:z:"); + ACE_Get_Arg_Opt<char> get_opts(argc, argv, "s:t:i:r:x:e:z:"); int c; while ((c = get_opts()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp index 0b01378ccf8..da11974ffca 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp @@ -164,7 +164,7 @@ TestServer::~TestServer() // int TestServer::parseCommands(int argc, char* 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_Arg_Opt<char> get_opts(argc, argv, "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/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp index bcebff9a94f..3714c16935c 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp @@ -2,15 +2,18 @@ #include "TestClient.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); { - TestClient client(orb.in(), argc, argv); + TestClient client(orb.in(), convert.get_argc(), convert.get_ASCII_argv()); client.run(); } diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp index 6be76baf992..71611cb17b9 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp @@ -3,15 +3,18 @@ #include <ace/Get_Opt.h> #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { long retryCount = 0; - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); - ACE_Get_Opt get_opts(argc, argv, "r:"); + ACE_Get_Arg_Opt<char> get_opts(convert.get_argc(), convert.get_ASCII_argv(), "r:"); int c; while ((c = get_opts()) != -1) { diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp index ccf813d0e9c..8ebf26df60d 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp @@ -2,16 +2,19 @@ #include "TestServer.h" #include <ace/streams.h> +#include "ace/Argv_Type_Converter.h" -int main(int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { CORBA::ORB_var orb; - orb = CORBA::ORB_init(argc, argv); + orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv()); { - TestServer server(orb.in(), argc, argv); + TestServer server(orb.in(), convert.get_argc(), convert.get_ASCII_argv()); server.run(); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc index fc8803905f7..709b7e60370 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc @@ -32,6 +32,7 @@ project(*Controller) : orbsvcsexe, exceptions { // A client that uses corba to test out basic imr functionality project(*Test) : orbsvcsexe, exceptions { + exename = test after += *IDL source_files { test.cpp @@ -43,6 +44,7 @@ project(*Test) : orbsvcsexe, exceptions { // A server to use with the imr project(*TestServer) : orbsvcsexe, portableserver, iortable, exceptions { + exename = test_server after += *IDL // The gnuace specific portion is to prevent invalid object files from // IDL generated files being compiled simultaneously with parallel builds. diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 5864e974d00..618fb276e2f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -8,7 +8,7 @@ #include "ace/Service_Config.h" #include "ace/streams.h" #include "ace/OS_NS_string.h" - +#include "ace/Argv_Type_Converter.h" using namespace CORBA; using namespace PortableServer; @@ -27,7 +27,7 @@ public: { ACE_ASSERT(s != 0); ACE_ASSERT(ACE_OS::strlen(s) > 0); - return asc_.process_directive(s); + return asc_.process_directive(ACE_TEXT_TO_TCHAR_IN(s)); } virtual void reconfigure() ACE_THROW_SPEC ((CORBA::SystemException)) @@ -36,14 +36,16 @@ public: } }; -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + try { ACE_Service_Config config; config.open(argc, argv); - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references("RootPOA"); POA_var poa = POA::_narrow(obj.in()); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp index 0bab1bfd6aa..8e2558f12c3 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp @@ -6,6 +6,7 @@ #include <ace/streams.h> #include <ace/SString.h> #include <ace/Log_Msg.h> +#include "ace/Argv_Type_Converter.h" using namespace CORBA; @@ -39,13 +40,15 @@ namespace { } } -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); try { - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); - if (! parse_args(argc, argv)) { + if (! parse_args(convert.get_argc(), convert.get_ASCII_argv())) { showusage(); return 1; } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 8566023c945..36e08acfd2a 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void) } int -DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL) +DynServer_Loader::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { try { diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index c222ebe531e..9bc066ca4f8 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -31,7 +31,7 @@ public: // spawns a thread to run an internal orb which has activated // a single DynServer servant. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Allows the service configurator to shutdown the orb virtual int fini (void); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index 0976425f762..807f4a68a0f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -6,9 +6,12 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" + #include <stdexcept> #include <string> + #define assertTrue(CONDITION) \ if (CONDITION == false) { \ ACE_CString str ("Error : "#CONDITION" "__FILE__":"); \ @@ -19,13 +22,13 @@ using namespace CORBA; -int -main (int argc, char* argv[]) +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { - try + ACE_Argv_Type_Converter convert (argc, argv); + + try { - - ORB_var orb = ORB_init (argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references ("Test"); test_var test = test::_narrow (obj.in ()); @@ -34,12 +37,12 @@ main (int argc, char* argv[]) Long n = test->get (); Long m = test->get (); assertTrue (m == n + 1); - + ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n")); return 0; - } - catch (CORBA::Exception& e) + } + catch (CORBA::Exception& e) { ACE_PRINT_EXCEPTION (e, "test:"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index a3d821fde70..d9a7fd6804f 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -9,6 +9,7 @@ #include "ace/streams.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" using namespace CORBA; using namespace PortableServer; @@ -38,11 +39,13 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam return poa._retn(); } -int main(int argc, char* argv[]) { +int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) +{ + ACE_Argv_Type_Converter convert (argc, argv); try { - ORB_var orb = ORB_init(argc, argv); + ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv()); Object_var obj = orb->resolve_initial_references("RootPOA"); POA_var root_poa = POA::_narrow(obj.in()); diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp index 47508dba78e..d2f13bc1206 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp @@ -1,7 +1,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "ace/streams.h" - +#include "ace/Argv_Type_Converter.h" ACE_RCSID (LoadBalancing, client, @@ -16,7 +16,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:"); int c; while ((c = get_opts ()) != -1) @@ -49,15 +49,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 66d41596ce8..591da3c57c0 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -3,6 +3,7 @@ #include "ORBInitializer.h" #include "RPS_Monitor.h" #include "ace/OS.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Get_Opt.h" @@ -21,7 +22,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -238,8 +239,10 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { ORBInitializer *initializer = 0; @@ -254,7 +257,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -277,7 +280,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -328,7 +331,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 6c4fd3a47b3..288e3c695af 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -25,7 +25,7 @@ TLS_Client::~TLS_Client () } void -TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +TLS_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -37,7 +37,7 @@ TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) void TLS_Client::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index b06ffc65f92..1e9c617cb97 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -31,14 +31,14 @@ class TLS_Client TLS_Client (void); ~TLS_Client (); - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run_tests (ACE_ENV_SINGLE_ARG_DECL); // Run the tests.. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp index 3b5098b43ad..33ac63e3a3c 100644 --- a/TAO/orbsvcs/examples/Log/Basic/main.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp @@ -1,5 +1,6 @@ #include "TLS_Client.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Basic, main, @@ -9,11 +10,13 @@ ACE_RCSID (Basic, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TLS_Client client; // Telecom Log Service Client ACE_TRY_NEW_ENV { - client.init (argc, argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 1b102beac2f..b95683ef2a4 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -1,6 +1,7 @@ #include "Event_Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event, Event_Consumer, @@ -12,9 +13,11 @@ ACE_RCSID (Event, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index f65f4a420e9..390fd1eea30 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,6 +1,7 @@ #include "Event_Supplier.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Event, Event_Supplier, @@ -16,9 +17,11 @@ ACE_RCSID (Event, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 0d27c8860d3..23db295bd76 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, Notify_Consumer, @@ -20,9 +21,11 @@ ACE_RCSID (Notify, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 86fbfd2be3c..03ffa87f327 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,6 +1,7 @@ #include "Notify_Supplier.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, Notify_Supplier, @@ -20,9 +21,11 @@ ACE_RCSID (Notify, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index a9ce5387a62..6dff34ef7b7 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RTEvent, RTEvent_Consumer, @@ -13,9 +14,11 @@ ACE_RCSID (RTEvent, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index 1a2de3ca9b9..7f2286132ff 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/Event_Service_Constants.h" #include "ace/OS_main.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (RTEvent, RTEvent_Supplier, @@ -18,9 +19,11 @@ ACE_RCSID (RTEvent, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 3e6109e1ee1..b48d70383aa 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -25,6 +25,7 @@ // For in-process Notification Service. // #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Notify/Service.h" #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper. @@ -204,11 +205,13 @@ private: }; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ORB_var orb (ORB_init (argc, argv)); + ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv())); if (argc < 2) { @@ -287,7 +290,7 @@ main (int argc, char* argv[]) if (argc < 3) space_craft_name = "a"; // Default to spacecraft "a". else - space_craft_name = argv[2]; + space_craft_name = convert.get_ASCII_argv()[2]; // Do a quick mapping to mcast addresses. // @@ -322,7 +325,7 @@ main (int argc, char* argv[]) // Start the agent. // - Agent agent (space_craft_name, argv[1], channel.in ()); + Agent agent (space_craft_name, convert.get_ASCII_argv()[1], channel.in ()); orb->run (); diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index 2751694dcd7..e858f379b04 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -17,6 +17,7 @@ // For in-process Notification Service. // #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Notify/Service.h" #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper. @@ -33,11 +34,13 @@ using namespace CosNotification; using namespace CosNotifyChannelAdmin; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { - ORB_var orb (ORB_init (argc, argv)); + ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv())); if (argc < 2) { @@ -134,7 +137,7 @@ main (int argc, char* argv[]) ACE_INET_Addr space_craft_addr; char const* space_craft_name = 0; - space_craft_name = argv[1]; + space_craft_name = convert.get_ASCII_argv()[1]; // Do a quick mapping to mcast addresses. // diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index a2aa9dbf434..b65a677e0b8 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -28,7 +28,7 @@ FilterClient::~FilterClient () } void -FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +FilterClient::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -77,7 +77,7 @@ FilterClient::done (void) void FilterClient::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index e7f9cd236a4..5d767320a86 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -40,7 +40,7 @@ class FilterClient ~FilterClient (); // Destructor - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run (ACE_ENV_SINGLE_ARG_DECL); @@ -50,7 +50,7 @@ class FilterClient // Consumer calls done, We're done. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 845f7ab68f7..0e3641cd299 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -2,15 +2,18 @@ // $Id$ #include "Filter.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + FilterClient client; ACE_TRY_NEW_ENV { - client.init (argc, argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 942d444d0cf..fed61e55a87 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$") @@ -26,13 +27,13 @@ TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client () int TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LanePriority")))) // LanePriority + if ((current_arg = arg_shifter.get_the_parameter ("-LanePriority"))) // LanePriority { if (current_arg != 0) { @@ -212,13 +213,14 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -232,7 +234,7 @@ main (int argc, char *argv []) TAO_Notify_Lanes_Consumer_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 2acb6bcc18b..12dec500064 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,6 +10,7 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") @@ -27,13 +28,13 @@ TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client () int TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -42,7 +43,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -212,13 +213,14 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -235,7 +237,7 @@ main (int argc, char *argv []) /* Create a Client */ TAO_Notify_Lanes_Supplier_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a7a0e96183f..a410ae315e7 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -31,7 +31,7 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL) +Subscribe::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -73,11 +73,10 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, - char *argv [] + char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 126b842a4ca..0c06932cf8f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -35,7 +35,7 @@ class Subscribe Subscribe (void); ~Subscribe (); - void init (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Init the Client. void run (ACE_ENV_SINGLE_ARG_DECL); @@ -45,7 +45,7 @@ class Subscribe // Called when all events we are waiting for have occured. protected: - void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); + void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initializes the ORB. void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index b817728c231..392669fbb4e 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -2,15 +2,18 @@ // $Id$ #include "Subscribe.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Subscribe client; ACE_TRY_NEW_ENV { - client.init (argc, argv + client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 480dbb5005c..cfed55e07b4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,6 +9,7 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$") @@ -28,25 +29,25 @@ TAO_Notify_ThreadPool_Consumer_Client::~TAO_Notify_ThreadPool_Consumer_Client () int TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool. + if ((current_arg = arg_shifter.get_the_parameter("-ProxySupplier_ThreadPool"))) // Specify a threadpool. { this->proxy_supplier_thread_count_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-Delay")))) // seconds wait in consumer per push. + else if ((current_arg = arg_shifter.get_the_parameter("-Delay"))) // seconds wait in consumer per push. { this->delay_ = ACE_OS::atoi (current_arg); @@ -215,13 +216,14 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -235,7 +237,7 @@ main (int argc, char *argv []) TAO_Notify_ThreadPool_Consumer_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index fb8dcf0c8ad..9ff3ca8bd3e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -10,6 +10,7 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") @@ -30,13 +31,13 @@ TAO_Notify_ThreadPool_Supplier_Client::~TAO_Notify_ThreadPool_Supplier_Client () int TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); - const ACE_TCHAR *current_arg = 0; + const char *current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to. + if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to. { if (current_arg != 0) { @@ -45,17 +46,17 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter("-EventChannel_ThreadPool"))) // Specify a threadpool. { this->ec_thread_count_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool. + else if ((current_arg = arg_shifter.get_the_parameter("-ProxyConsumer_ThreadPool"))) // Specify a threadpool. { this->proxy_consumer_thread_count_= ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to. + else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to. { if (current_arg != 0) { @@ -64,7 +65,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events + else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events { this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ()); @@ -210,13 +211,14 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize an ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -233,7 +235,7 @@ main (int argc, char *argv []) /* Create a Client */ TAO_Notify_ThreadPool_Supplier_Client client (orb_objects); - if (client.parse_args (argc, argv) != 0) + if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n")); return -1; diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp index 2ab7caa0a2b..a14758fcaf0 100644 --- a/TAO/orbsvcs/examples/ORT/client.cpp +++ b/TAO/orbsvcs/examples/ORT/client.cpp @@ -2,6 +2,7 @@ #include "sum_serverC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (ORT, client, @@ -12,7 +13,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,16 +34,19 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_sum_orb", ACE_TRY_ENV); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + "client_sum_orb", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp index d52bc63f0f2..bc8e494a2c9 100644 --- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp +++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp @@ -5,13 +5,14 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,19 +35,20 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "gateway_server_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; /// Resolve reference to RootPOA @@ -162,7 +164,7 @@ main (int argc, char *argv[]) /// If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp index 1b76cecb393..f26e69452d6 100644 --- a/TAO/orbsvcs/examples/ORT/server.cpp +++ b/TAO/orbsvcs/examples/ORT/server.cpp @@ -6,13 +6,14 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,8 +36,10 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -61,13 +64,12 @@ main (int argc, char *argv[]) // The usual initialization stuff // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "server_sum_orb" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Resolve reference to RootPOA @@ -124,7 +126,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the IOR to it. if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing " diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp index 91add5d9900..2f54ef7820e 100644 --- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp +++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp @@ -28,7 +28,7 @@ const char *ior_output_file = "simple_naming.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp index a634a736993..63299c53c57 100644 --- a/TAO/orbsvcs/examples/PSS/client.cpp +++ b/TAO/orbsvcs/examples/PSS/client.cpp @@ -23,7 +23,7 @@ #include "ServerC.h" #include "Simple_Naming_i.h" -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp index 0f305dfae1d..03162c04a51 100644 --- a/TAO/orbsvcs/examples/PSS/server.cpp +++ b/TAO/orbsvcs/examples/PSS/server.cpp @@ -25,7 +25,7 @@ ACE_RCSID (PSS, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 05b214aabbc..b4c3bf4efd2 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/CosNamingC.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Consumer, @@ -18,11 +19,13 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -179,7 +182,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) int Consumer::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index a25e9f67569..8415251c710 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -16,11 +17,13 @@ ACE_RCSID (EC_Examples, static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC channel; - return channel.run (argc, argv); + return channel.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -138,7 +141,7 @@ EC::run (int argc, char* argv[]) int EC::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index c1be767ffd8..f7a3bf17e16 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -17,11 +18,13 @@ static const char* supplierec = 0; static const char* consumerec = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Gateway gateway; - return gateway.run (argc, argv); + return gateway.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -160,7 +163,7 @@ Gateway::run (int argc, char* argv[]) int Gateway::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index aad09c037e8..3fa33011289 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -8,6 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, @@ -19,11 +20,13 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -174,7 +177,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) int Supplier::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 3a01a04e9c0..21baca54cea 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Sched/Reconfig_Scheduler.h" #include "orbsvcs/Runtime_Scheduler.h" //#include "orbsvcs/Event/Module_Factory.h" @@ -42,8 +43,10 @@ typedef TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_MUF_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + //TAO_EC_Default_Factory::init_svcs (); TAO_EC_Kokyu_Factory::init_svcs (); @@ -54,10 +57,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -497,14 +500,14 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "cs:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "cs:"); int c; while ((c = get_opts ()) != -1) switch (c) { case 's': - sched_type = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); + sched_type = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ()); break; case '?': diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index f61cb958eeb..81bd9b3ab9e 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -14,6 +14,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, MCast, @@ -25,8 +26,10 @@ const char *udp_mcast_address = int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO @@ -49,13 +52,13 @@ main (int argc, char* argv[]) // Create the ORB, pass the argv list for parsing. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the // -ORB options from the command line. - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-m udp_mcast_addr]\n")); @@ -354,7 +357,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "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 bb27f0bad68..05e5720ca3e 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,6 +15,7 @@ #include "ace/Sched_Params.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_Examples, Service, "$Id$") @@ -25,8 +26,10 @@ int parse_args (int argc, char *argv[]); typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -34,10 +37,10 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) { ACE_ERROR ((LM_ERROR, "Usage: Service [-o IOR_file_name]\n")); @@ -383,7 +386,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "c"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "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 e8af9a77ed8..a2cb57cbef6 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -4,17 +4,20 @@ #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Consumer, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Consumer consumer; - return consumer.run (argc, argv); + return consumer.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index a3bd5e5740d..5085c1cc50e 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -5,6 +5,7 @@ #include "ace/Get_Opt.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Service, @@ -15,8 +16,10 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ACE_DECLARE_NEW_CORBA_ENV; @@ -24,7 +27,7 @@ main (int argc, char* argv[]) { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = @@ -82,7 +85,7 @@ main (int argc, char* argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -116,7 +119,7 @@ main (int argc, char* argv[]) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "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 21ced08639e..af29866c0ec 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -5,17 +5,20 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Examples, Supplier, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Supplier supplier; - return supplier.run (argc, argv); + return supplier.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index b7779c65615..4e82a15ffa4 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -9,7 +9,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -32,7 +32,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 2b39bda82e3..e2550d85d06 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (SecurityLevel1, const char *ior_output_file = 0; int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index 507bdde5847..1c930262112 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" ACE_RCSID(Send_File, client, "$Id$") @@ -11,7 +12,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -34,15 +35,17 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var object = diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 97a4beace1c..c71c738e8bd 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,6 +4,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Send_File, server, "$Id$") @@ -12,7 +13,7 @@ const char *ior_output_file = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,12 +36,14 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -60,7 +63,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Simple_Server_i server_impl (orb.in ()); @@ -78,7 +81,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", |