diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event')
34 files changed, 190 insertions, 89 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 6e4b0d31665..3ddb3d7c466 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -4,6 +4,7 @@ #include "Counting_Supplier.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Event_Utilities.h" @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; 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; @@ -27,7 +30,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 93e068b6d84..794eed8a11b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "tao/ORB_Core.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/INET_Addr.h" ACE_RCSID (EC_Tests_Basic, @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_BCast driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -28,12 +31,12 @@ EC_BCast::EC_BCast (void) } int -EC_BCast::parse_args (int& argc, char* argv[]) +EC_BCast::parse_args (int& argc, char **argv) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -85,7 +88,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; // Obtain UDP address in the string format for Gateway initialization. - char address_server_arg [256]; + ACE_TCHAR address_server_arg [256]; ACE_INET_Addr udp_addr; if (udp_addr.set (this->bcast_port_, this->bcast_address_) == -1 || udp_addr.addr_to_string (address_server_arg, 256) == -1) @@ -103,7 +106,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) TAO_ECG_Mcast_Gateway gateway; if (gateway.init (sub, - address_server_arg, + ACE_TEXT_TO_CHAR_IN(address_server_arg), lAttributes) == -1) return; diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 83ee58c7eb8..4c299497b98 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Bitmask, "$Id$") 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; @@ -22,7 +25,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 5a021eb4e08..3cb84193bb9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Complex, "$Id$") 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; @@ -21,7 +24,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index d5e07b61bb9..ce99d63f092 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -9,6 +9,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Control, @@ -18,8 +19,10 @@ const int event_type = 20; const int event_source = 10; 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; @@ -27,7 +30,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index f0a3aafbcae..8f7708cefec 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Disconnect, @@ -17,8 +18,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_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 (); ACE_DECLARE_NEW_CORBA_ENV; @@ -26,7 +29,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc index d18e0dd4515..7e0cca0b454 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc +++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc @@ -2,90 +2,105 @@ // $Id$ project(*Reconnect): rteventtestexe { + exename = Reconnect Source_Files { Reconnect.cpp } } project(*Shutdown): rteventtestexe { + exename = Shutdown Source_Files { Shutdown.cpp } } project(*Observer): rteventtestexe { + exename = Observer Source_Files { Observer.cpp } } project(*BCast): rteventtestexe { + exename = BCast Source_Files { BCast.cpp } } project(*Timeout): rteventtestexe { + exename = Timeout Source_Files { Timeout.cpp } } project(*Wildcard): rteventtestexe { + exename = Wildcard Source_Files { Wildcard.cpp } } project(*Negation): rteventtestexe { + exename = Negation Source_Files { Negation.cpp } } project(*Disconnect): rteventtestexe { + exename = Disconnect Source_Files { Disconnect.cpp } } project(*MT_Disconnect): rteventtestexe { + exename = MT_Disconnect Source_Files { MT_Disconnect.cpp } } project(*Atomic_Reconnect): rteventtestexe { + exename = Atomic_Reconnect Source_Files { Atomic_Reconnect.cpp } } project(*Bitmask): rteventtestexe { + exename = Bitmask Source_Files { Bitmask.cpp } } project(*Complex): rteventtestexe { + exename = Complex Source_Files { Complex.cpp } } project(*Gateway): rteventtestexe { + exename = Gateway Source_Files { Gateway.cpp } } project(*Control): rteventtestexe { + exename = Control Source_Files { Control.cpp } } project(*Random) : rteventtestexe { + exename = Random Source_Files { Random.cpp } diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 39c750d1a4d..324bda69d55 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Gateway, "$Id$") 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; @@ -22,7 +25,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 9f91b760a0a..79c8420c310 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, MT_Disconnect, @@ -18,8 +19,10 @@ static void run_test (PortableServer::POA_ptr poa, ACE_ENV_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 (); ACE_DECLARE_NEW_CORBA_ENV; @@ -27,7 +30,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 37ab5c1fb30..8d4124d1ea7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -7,14 +7,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Negation, "$Id$") 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; @@ -22,7 +25,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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index d58d828573f..ee0756b5de7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -13,11 +14,13 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") 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 (); EC_Master master; - return master.run (argc, argv); + return master.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -192,9 +195,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[] } int -EC_Master::parse_args (int &argc, char *argv []) +EC_Master::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/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index bb788c01258..738c8f8d257 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -49,7 +49,7 @@ public: EC_Observer* channel (int i) const; private: - int parse_args (int &argc, char *argv []); + int parse_args (int &argc, char *argv[]); private: /// The seed diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b9397f997ed..471ea0ab073 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_unistd.h" @@ -14,10 +15,12 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + RND_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -62,7 +65,7 @@ RND_Driver::run (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/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 1fd8c294029..a00e851f14e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" ACE_RCSID (EC_Tests_Basic, @@ -12,10 +13,12 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Reconnect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -33,7 +36,7 @@ EC_Reconnect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - ACE_Get_Opt get_opt (argc, argv, "scd:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index b06b6e50355..0eca9c96a9d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -14,7 +14,7 @@ ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { EC_Schedule driver; return driver.run (argc, argv); @@ -28,7 +28,7 @@ EC_Schedule::EC_Schedule (void) } int -EC_Schedule::parse_args (int& argc, char* argv[]) +EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[]) { if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index c139b699227..7fc14197459 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -47,7 +47,7 @@ public: // = The EC_Driver methods /// add some command line args to change the scheduling service to /// use. - virtual int parse_args (int& argc, char* argv[]); + virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args (void) const; virtual void print_usage (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index ea2c18a1743..3ae199c24c0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -3,14 +3,17 @@ #include "Shutdown.h" #include "Consumer.h" #include "Supplier.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Shutdown driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index f00ec8abab4..6a2f80bde09 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -7,6 +7,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Timeout, @@ -15,8 +16,10 @@ ACE_RCSID (EC_Tests, // **************************************************************** 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 = diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index af77cc9fcbd..05ad26f5f44 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -6,14 +6,17 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests, Wildcard, "$Id$") 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; @@ -21,7 +24,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 = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 667ac9e8efb..178d8417b90 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" @@ -26,9 +27,9 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message) } int -Gateway_EC::parse_args (int argc, char *argv []) +Gateway_EC::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "i:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:"); int opt; while ((opt = get_opt ()) != EOF) @@ -63,7 +64,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb, str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; - FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w"); + FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, ACE_TEXT("w")); if (output_file == 0) { ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 6d81936beb4..9fb285b1fbc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -137,16 +138,18 @@ 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 { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "", ACE_TRY_ENV); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 7ab5ff9b030..6b02f5b9bea 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -1,12 +1,15 @@ // $Id$ #include "Gateway_EC.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); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index ab13f1a28ef..314be258b0f 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -54,17 +55,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 { // Initialize ORB and parse args. 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) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 7b95c67318f..81596b248fc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/RtecEventCommS.h" +#include "ace/Argv_Type_Converter.h" class EC_Consumer: public POA_RtecEventComm::PushConsumer @@ -105,16 +106,18 @@ 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 { // Initialize ORB and POA, POA Manager, parse args. 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) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp index 462f226b0aa..d89047ce037 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.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); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index d7d0b4f1973..a22424715e1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/RtecEventCommC.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" void send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer @@ -44,16 +45,18 @@ 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 { // Initialize ORB and parse args. 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) return 1; // Obtain reference to EC. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index ce7c85cdd95..c7c7ddc57d3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -14,6 +14,7 @@ #include "ace/Array_Base.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Reactor.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" @@ -571,7 +572,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) int parse_args (int argc, char ** argv) { - ACE_Get_Opt get_opt (argc, argv, "d"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "d"); int opt; while ((opt = get_opt ()) != EOF) @@ -597,8 +598,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); + // We may want this to be alive beyond the next block. TAO_EC_Servant_Var<Heartbeat_Application> app; @@ -606,10 +609,10 @@ main (int argc, char *argv[]) { // Initialize ORB and POA, POA Manager, parse args. 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) return 1; CORBA::Object_var obj = diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp index c048843d90b..f6f1bf18f7d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -1,13 +1,16 @@ // $Id$ #include "Gateway_EC.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); + Gateway_EC test; - if (test.run (argc, argv) == -1) + if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1) return 1; return 0; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 874f96cc737..5cad1a265c6 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -5,6 +5,7 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/OS_NS_strings.h" @@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Connect driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -38,7 +41,7 @@ EC_Connect::parse_args (int& argc, char* argv[]) if (this->EC_Driver::parse_args (argc, argv) != 0) return -1; - 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/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index c3c4661d8c2..faccac7ef74 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -7,16 +7,19 @@ #include "orbsvcs/Event_Utilities.h" #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Inversion, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Inversion driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -27,9 +30,9 @@ EC_Inversion::EC_Inversion (void) } int -EC_Inversion::parse_args (int &argc, char *argv []) +EC_Inversion::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/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 2d0cd3903aa..16e4ce2faa1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Basic_Stats.h" #include "ace/Sched_Params.h" @@ -23,8 +24,10 @@ const char *ec_ior = "file://ec.ior"; static 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); + int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; @@ -50,7 +53,7 @@ main (int argc, char *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 (TAO_HAS_CORBA_MESSAGING == 1) @@ -104,7 +107,7 @@ main (int argc, char *argv []) poa_manager->activate (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; // Get the event channel object reference @@ -224,7 +227,7 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -272,7 +275,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 524d4301164..2ee08132c40 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -8,6 +8,7 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Sample_History.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -20,8 +21,10 @@ const char *ior_file_name = "ec.ior"; static 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 (); int priority = @@ -49,7 +52,7 @@ main (int argc, char *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 (TAO_HAS_CORBA_MESSAGING == 1) @@ -103,7 +106,7 @@ main (int argc, char *argv []) poa_manager->activate (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; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -122,7 +125,7 @@ main (int argc, char *argv []) if (ior_file_name != 0) { - FILE *output_file= ACE_OS::fopen (ior_file_name, "w"); + FILE *output_file= 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", @@ -156,7 +159,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/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 513434e07f9..9a1336b4d3f 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -5,16 +5,19 @@ #include "Supplier.h" #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (EC_Tests_Performance, Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + EC_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index d74d6f76b84..3bf1845cb11 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -13,6 +13,7 @@ #include "ace/Sched_Params.h" #include "ace/Arg_Shifter.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/OS_NS_errno.h" @@ -106,7 +107,7 @@ EC_Driver::run_init (int &argc, char* argv[] if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -727,9 +728,9 @@ EC_Driver::dump_results (void) } int -EC_Driver::parse_args (int &argc, char *argv []) +EC_Driver::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 ()) { |