diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Mcast')
9 files changed, 50 insertions, 25 deletions
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; |