diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 5c221ea3c6c..3d43e3df4e3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -61,7 +61,7 @@ parse_args (int argc, char *argv[]) int ACE_TMAIN (int argc, - char *argv[]) + ACE_TCHAR *argv[]) { ACE_Argv_Type_Converter convert (argc, argv); @@ -72,13 +72,12 @@ ACE_TMAIN (int argc, ACE_TRY { // Initilaize the ORB, POA etc. - manager.init (argc, - argv + manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; // Merge the different IORS @@ -122,7 +121,7 @@ Manager::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -313,7 +312,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) int argc = 0; char **argv = 0; - this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; |