summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Simple_Naming/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Simple_Naming/client.cpp')
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/client.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 904a68a489b..a81edd2f705 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -21,6 +21,7 @@
#include "client.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Simple_Naming, client, "$Id$")
@@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void)
int
CosNaming_Client::parse_args (void)
{
- ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
+ ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:");
int c;
while ((c = get_opts ()) != -1)
@@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void)
if (this->test_ == 0)
{
FILE * ior_output_file =
- ACE_OS::fopen (get_opts.opt_arg (), "w");
+ ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
if (ior_output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
// This function runs the test.
int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
CosNaming_Client cosnaming_client;
- if (cosnaming_client.init (argc, argv) == -1)
+ if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
return 1;
return cosnaming_client.run ();