summaryrefslogtreecommitdiff
path: root/TAO/tests/Portable_Interceptors/AMI/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Portable_Interceptors/AMI/server.cpp')
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/server.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index 0c52ac89b18..3b3d86fec08 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -5,6 +5,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID (Portable_Interceptors,
@@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -41,8 +42,10 @@ 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_TRY_NEW_ENV
{
{
@@ -54,7 +57,7 @@ main (int argc, char *argv[])
}
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 =
@@ -74,7 +77,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;
Echo *echo_impl;
@@ -92,7 +95,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
// Output the IOR to the <ior_output_file>
- 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",