diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index ebfd98f3df1..e426c722707 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.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" @@ -24,10 +25,9 @@ IdAssignment::~IdAssignment (void) } int -IdAssignment::parse_args (int argc, - char *argv[]) +IdAssignment::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter< char > arg_shifter (argc, argv); const char *current_arg = 0; @@ -83,8 +83,7 @@ IdAssignment::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; @@ -458,18 +457,18 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) //******************************************************************************** } -int main (int argc, char* argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { IdAssignment 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; |