summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP/AMI/server.cpp')
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/server.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index ee6a7282b5f..2e841274430 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -23,6 +23,7 @@
#include "tao/debug.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/OS_NS_sys_socket.h"
ACE_RCSID(AMI, server, "$Id$")
@@ -32,7 +33,7 @@ const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:d");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
int c;
while ((c = get_opts ()) != -1)
@@ -58,14 +59,16 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server"));
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
ACE_OS::socket_init ();
@@ -105,7 +108,7 @@ main (int argc, char *argv[])
// If the ior_output_file exists, output the ior to it
if (ior_output_file != 0)
{
- FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+ FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"Cannot open output file for writing IOR: %s",