summaryrefslogtreecommitdiff
path: root/TAO/utils/nslist/nsdel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils/nslist/nsdel.cpp')
-rw-r--r--TAO/utils/nslist/nsdel.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index d5d66818015..0b426a93c8d 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -60,7 +60,7 @@ namespace
} // end of local unnamed namespace
int
-ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
CosNaming::Name the_name (0);
CORBA::ORB_var orb;
@@ -68,18 +68,13 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
try
{
// Contact the orb
- ACE_Argv_Type_Converter argcon (argcw, argvw);
- orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+ orb = CORBA::ORB_init (argc, argv);
// Scan through the command line options
bool
failed = false,
quiet = false,
destroy = false;
- int
- argc = argcon.get_argc ();
- ACE_TCHAR
- **argv = argcon.get_TCHAR_argv ();
const ACE_TCHAR *const pname = argv[0];
const ACE_TCHAR *nameService = 0;
ACE_TCHAR kindsep = ACE_TEXT('.');
@@ -336,6 +331,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
}
}
}
+ orb->destroy ();
}
catch (const CosNaming::NamingContext::NotFound& nf)
{
@@ -387,6 +383,5 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
return 1;
}
- orb->destroy ();
return 0;
}