diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 0bb420600c7..9e86827c5c4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -2,6 +2,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/debug.h" #include <orbsvcs/CosNamingC.h> #include <orbsvcs/CosNotifyCommC.h> @@ -23,10 +24,9 @@ LifeCycle::~LifeCycle (void) } int -LifeCycle::parse_args (int argc, - char *argv[]) +LifeCycle::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -65,8 +65,7 @@ LifeCycle::init (int argc, char* argv[] ACE_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -242,18 +241,18 @@ LifeCycle::destroy_ec (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_DECLARE_NEW_CORBA_ENV; ACE_TRY { LifeCycle test; - test.parse_args (argc, - argv); + test.parse_args (convert.get_argc(), convert.get_ASCII_argv()); - test.init (argc, - argv + test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |